diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_0.cdl b/cells/a2111o/sky130_fd_sc_lp__a2111o_0.cdl
index 9a831d8..235011e 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_0.cdl
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_0.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__a2111o_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPB0 pndB B1 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
+MMPC0 pndC C1 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
+MMPD0 y D1 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
+MMIPX X y 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
-MMPA1 pndA A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 y D1 VNB nfet_01v8 m=1 w=0.42 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=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.42 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.42 l=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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a2111o_0
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_0.netlist.tsv b/cells/a2111o/sky130_fd_sc_lp__a2111o_0.netlist.tsv
index 848357a..f74d520 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_0.netlist.tsv
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_0.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__a2111o_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	y	D1	pndC	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	pndC	C1	pndB	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	y	D1	pndC	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a2111o/sky130_fd_sc_lp__a2111o_0.spice b/cells/a2111o/sky130_fd_sc_lp__a2111o_0.spice
index cdb96a5..203f478 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_0.spice
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_0.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a2111o_0 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 a_468_476# A2 VPWR VPB phighvt w=640000u l=150000u
-+  ad=4.864e+11p pd=4.08e+06u as=3.488e+11p ps=3.65e+06u
-M1001 a_80_159# D1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=5.061e+11p ps=4.93e+06u
-M1002 a_312_476# D1 a_80_159# VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.696e+11p ps=1.81e+06u
-M1003 a_468_476# B1 a_390_476# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1004 a_80_159# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_80_159# X VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1006 VPWR A1 a_468_476# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND C1 a_80_159# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_80_159# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1009 a_390_476# C1 a_312_476# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_582_47# A1 a_80_159# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1011 VGND A2 a_582_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_468_476# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_312_476# C1 a_390_476# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 VPWR A2 a_468_476# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_582_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 X a_80_159# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_80_159# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 a_390_476# B1 a_468_476# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 VGND D1 a_80_159# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND B1 a_80_159# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_80_159# D1 a_312_476# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X10 a_80_159# C1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_80_159# A1 a_582_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_1.cdl b/cells/a2111o/sky130_fd_sc_lp__a2111o_1.cdl
index 147a5a5..6755f49 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_1.cdl
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 pndC C1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPD0 y D1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 y D1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.26 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.84 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.84 l=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.84 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a2111o_1
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_1.netlist.tsv b/cells/a2111o/sky130_fd_sc_lp__a2111o_1.netlist.tsv
index 5285bd5..b7484bf 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_1.netlist.tsv
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	y	D1	pndC	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_1.spice b/cells/a2111o/sky130_fd_sc_lp__a2111o_1.spice
index 80bd2d5..83d4b00 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_1.spice
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a2111o_1 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 VGND C1 a_105_239# VNB nshort w=840000u l=150000u
-+  ad=1.155e+12p pd=7.79e+06u as=7.896e+11p ps=5.24e+06u
-M1001 a_403_367# C1 a_325_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.914e+11p pd=3.3e+06u as=3.024e+11p ps=3e+06u
-M1002 a_511_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.1151e+12p pd=6.81e+06u as=6.867e+11p ps=6.13e+06u
-M1003 a_105_239# B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_511_367# B1 a_403_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_673_49# A1 a_105_239# VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1006 VGND A2 a_673_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A1 a_511_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_105_239# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1009 a_325_367# D1 a_105_239# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1010 VGND a_105_239# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1011 a_105_239# D1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_511_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_673_49# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_403_367# B1 a_511_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR A2 a_511_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_325_367# C1 a_403_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_105_239# A1 a_673_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 X a_105_239# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 X a_105_239# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_105_239# D1 a_325_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VGND D1 a_105_239# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_105_239# C1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VGND B1 a_105_239# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_2.cdl b/cells/a2111o/sky130_fd_sc_lp__a2111o_2.cdl
index 8323dd2..1111956 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_2.cdl
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 pndC C1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPD0 y D1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 y D1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.26 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.84 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.84 l=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.84 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 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_lp__a2111o_2
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_2.netlist.tsv b/cells/a2111o/sky130_fd_sc_lp__a2111o_2.netlist.tsv
index 193c46e..16853af 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_2.netlist.tsv
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	y	D1	pndC	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_2.spice b/cells/a2111o/sky130_fd_sc_lp__a2111o_2.spice
index deeb8c3..3af6183 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_2.spice
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__a2111o_2 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 a_86_275# B1 VGND VNB nshort w=840000u l=150000u
-+  ad=5.166e+11p pd=4.59e+06u as=1.512e+12p ps=1.032e+07u
-M1001 a_607_367# B1 a_499_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=8.253e+11p pd=6.35e+06u as=4.914e+11p ps=3.3e+06u
-M1002 VGND A2 a_715_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=3.276e+11p ps=2.46e+06u
-M1003 X a_86_275# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1004 a_86_275# D1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_86_275# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=1.1592e+12p ps=9.4e+06u
-M1006 VGND a_86_275# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A1 a_607_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_427_367# D1 a_86_275# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=3.339e+11p ps=3.05e+06u
-M1009 VGND C1 a_86_275# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_86_275# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_499_367# C1 a_427_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_607_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_715_49# A1 a_86_275# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_86_275# D1 a_427_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_427_367# C1 a_499_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_86_275# A1 a_715_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VGND a_86_275# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_715_49# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND D1 a_86_275# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_86_275# C1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VGND B1 a_86_275# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VPWR a_86_275# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR A2 a_607_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 X a_86_275# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 X a_86_275# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_607_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_499_367# B1 a_607_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_4.cdl b/cells/a2111o/sky130_fd_sc_lp__a2111o_4.cdl
index 10cffe3..afac154 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_4.cdl
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 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
-MMPB0 pndB B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 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
+MMNB0 y B1 VNB nfet_01v8 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 pndC C1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 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 y D1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 y D1 VNB nfet_01v8 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 phighvt m=4 w=1.26 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.84 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.84 l=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.84 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=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_lp__a2111o_4
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_4.netlist.tsv b/cells/a2111o/sky130_fd_sc_lp__a2111o_4.netlist.tsv
index 4958103..6978988 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_4.netlist.tsv
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	y	D1	pndC	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_4.spice b/cells/a2111o/sky130_fd_sc_lp__a2111o_4.spice
index 31f7b63..a4f074c 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_4.spice
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_lp__a2111o_4 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 a_63_367# C1 a_318_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0206e+12p pd=9.18e+06u as=7.056e+11p ps=6.16e+06u
-M1001 a_511_349# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.6695e+12p pd=1.273e+07u as=1.7262e+12p ps=1.534e+07u
-M1002 VGND C1 a_77_47# VNB nshort w=840000u l=150000u
-+  ad=2.2134e+12p pd=1.703e+07u as=1.1676e+12p ps=1.118e+07u
-M1003 a_77_47# A1 a_813_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1004 VGND D1 a_77_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_77_47# B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_63_367# D1 a_77_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1007 VGND a_77_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1008 X a_77_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_318_367# B1 a_511_349# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_813_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_77_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1012 a_77_47# C1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_318_367# C1 a_63_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B1 a_77_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_511_349# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_813_47# A1 a_77_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_77_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_77_47# D1 a_63_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_77_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A2 a_511_349# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A2 a_813_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_77_47# D1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR A1 a_511_349# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_77_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_511_349# B1 a_318_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_77_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 X a_77_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A2 a_511_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_77_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_63_367# C1 a_318_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_77_47# D1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND A2 a_813_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_813_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR A1 a_511_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_511_349# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR a_77_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 X a_77_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_511_349# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 X a_77_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_511_349# B1 a_318_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 VGND B1 a_77_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_318_367# C1 a_63_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_63_367# D1 a_77_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_77_47# A1 a_813_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 VGND D1 a_77_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_77_47# C1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 VGND a_77_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 X a_77_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 X a_77_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 a_318_367# B1 a_511_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 VGND C1 a_77_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 VGND a_77_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 a_77_47# D1 a_63_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 a_813_47# A1 a_77_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 VPWR a_77_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.cdl b/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.cdl
index 1d6ebff..dccd1f9 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.cdl
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.cdl
@@ -16,36 +16,36 @@
 
 .SUBCKT sky130_fd_sc_lp__a2111o_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPB0 pndB B1 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
+MMPC0 pndC C1 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
+MMPD0 y D1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIPX X y 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
-MMPB0 pndB B1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNB0 net99 B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 net86 C1 VNB nfet_01v8 m=1 w=0.42 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 nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MI10 y C1 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 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 l=0.25 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNB0 net99 B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 net86 C1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI11 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMND0 y D1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI12 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 y C1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI13 net71 A2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 net90 D1 VNB nfet_01v8 m=1 w=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 y B1 VNB nshort m=1 w=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 y A1 VNB nshort m=1 w=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 net71 A2 VNB nshort m=1 w=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 net90 D1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net63 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net63 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a2111o_lp
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.netlist.tsv b/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.netlist.tsv
index 13b47a8..521b95f 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.netlist.tsv
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.netlist.tsv
@@ -1,18 +1,18 @@
 sky130_fd_sc_lp__a2111o_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	y	D1	pndC	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	net99	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	net86	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	net90	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	y	C1	net86	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	net63	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	y	B1	net99	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	y	A1	net71	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	net71	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net90	D1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net63	y	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	pndC	C1	pndB	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	y	D1	pndC	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	net99	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	net86	C1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	net90	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	y	C1	net86	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	net63	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	y	B1	net99	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	y	A1	net71	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	net71	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net90	D1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net63	y	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/a2111o/sky130_fd_sc_lp__a2111o_lp.spice b/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.spice
index 59ca16d..3773c10 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.spice
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__a2111o_lp A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 a_134_409# D1 a_27_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=2.85e+11p ps=2.57e+06u
-M1001 a_114_47# D1 VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.549e+11p ps=4.21e+06u
-M1002 VGND C1 a_278_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1003 VPWR A2 a_739_409# VPB phighvt w=1e+06u l=250000u
-+  ad=6.4e+11p pd=5.28e+06u as=5.65e+11p ps=5.13e+06u
-M1004 a_868_57# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1005 a_27_409# A1 a_868_57# VNB nshort w=420000u l=150000u
-+  ad=3.57e+11p pd=4.22e+06u as=0p ps=0u
-M1006 a_232_409# C1 a_134_409# VPB phighvt w=1e+06u l=250000u
-+  ad=5.7e+11p pd=5.14e+06u as=0p ps=0u
-M1007 a_278_47# C1 a_27_409# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_27_409# a_436_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1009 a_710_57# B1 a_27_409# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1010 VGND B1 a_710_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_739_409# B1 a_232_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_739_409# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_436_47# a_27_409# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_409# D1 a_114_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_27_409# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
+X0 a_114_47# D1 a_27_409# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND D1 a_114_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_436_47# a_27_409# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR a_27_409# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 VGND A2 a_868_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_27_409# C1 a_278_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_27_409# B1 a_710_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_27_409# D1 a_134_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_134_409# C1 a_232_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_739_409# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 a_278_47# C1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_232_409# B1 a_739_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 a_868_57# A1 a_27_409# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VPWR A1 a_739_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X14 VGND a_27_409# a_436_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_710_57# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_m.cdl b/cells/a2111o/sky130_fd_sc_lp__a2111o_m.cdl
index 3391d27..1aa0f42 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_m.cdl
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_m.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__a2111o_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 y D1 VNB nfet_01v8 m=1 w=0.42 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=0.42 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.42 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.42 l=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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a2111o_m
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_m.netlist.tsv b/cells/a2111o/sky130_fd_sc_lp__a2111o_m.netlist.tsv
index 392b54e..24db43b 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_m.netlist.tsv
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_m.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__a2111o_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	y	D1	pndC	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	pndC	C1	pndB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	y	D1	pndC	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a2111o/sky130_fd_sc_lp__a2111o_m.spice b/cells/a2111o/sky130_fd_sc_lp__a2111o_m.spice
index 7e16da6..4fc31a8 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_m.spice
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_m.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a2111o_m A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 a_503_47# A1 a_85_21# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.352e+11p ps=2.8e+06u
-M1001 a_85_21# D1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=4.389e+11p ps=4.61e+06u
-M1002 VGND A2 a_503_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_339_369# C1 a_267_369# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=8.82e+10p ps=1.26e+06u
-M1004 a_411_369# A2 VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=2.457e+11p ps=2.85e+06u
-M1005 VPWR A1 a_411_369# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND C1 a_85_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_85_21# X VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1008 a_411_369# B1 a_339_369# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_85_21# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_85_21# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1011 a_267_369# D1 a_85_21# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 X a_85_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_503_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR A2 a_411_369# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VGND B1 a_85_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_85_21# A1 a_503_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_411_369# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_339_369# B1 a_411_369# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND D1 a_85_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 X a_85_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_85_21# C1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_85_21# D1 a_267_369# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_267_369# C1 a_339_369# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.cdl b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.cdl
index d4fbcd6..ee2c26f 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.cdl
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a2111oi_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPB0 pndB B1 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
+MMPC0 pndC C1 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
+MMPD0 Y D1 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
+MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=0.42 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=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=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.42 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.42 l=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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 Y D1 VNB nfet_01v8 m=1 w=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_lp__a2111oi_0
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.netlist.tsv b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.netlist.tsv
index 778fee1..606e06a 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.netlist.tsv
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a2111oi_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	Y	D1	pndC	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	pndC	C1	pndB	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	Y	D1	pndC	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	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/a2111oi/sky130_fd_sc_lp__a2111oi_0.spice b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.spice
index f6a06ea..37c81f6 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.spice
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a2111oi_0 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 a_432_47# A1 Y VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.352e+11p ps=2.8e+06u
-M1001 a_318_483# A2 VPWR VPB phighvt w=640000u l=150000u
-+  ad=3.488e+11p pd=3.65e+06u as=2.432e+11p ps=2.04e+06u
-M1002 Y D1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.696e+11p ps=4.28e+06u
-M1003 a_174_483# D1 Y VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=1.888e+11p ps=1.87e+06u
-M1004 a_246_483# C1 a_174_483# VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1005 VPWR A1 a_318_483# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_432_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND C1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_318_483# B1 a_246_483# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND D1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 Y A1 a_432_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_432_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_246_483# B1 a_318_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR A2 a_318_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 a_318_483# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 Y D1 a_174_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 a_174_483# C1 a_246_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.cdl b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.cdl
index 5eebd07..d0ee120 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.cdl
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 pndC C1 VPB phighvt m=1 w=1.26 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.26 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.84 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.84 l=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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 Y D1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a2111oi_1
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.netlist.tsv b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.netlist.tsv
index 982cba4..1ec62e6 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.netlist.tsv
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	Y	D1	pndC	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.spice b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.spice
index 60b3f10..a8a8abf 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.spice
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a2111oi_1 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 a_253_367# C1 a_157_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.78e+11p pd=3.12e+06u as=4.158e+11p ps=3.18e+06u
-M1001 VPWR A1 a_343_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=5.292e+11p pd=3.36e+06u as=8.631e+11p ps=6.41e+06u
-M1002 Y D1 VGND VNB nshort w=840000u l=150000u
-+  ad=6.846e+11p pd=4.99e+06u as=1.0122e+12p ps=7.45e+06u
-M1003 VGND A2 a_499_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=2.1e+06u
-M1004 a_343_367# B1 a_253_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_157_367# D1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=6.048e+11p ps=3.48e+06u
-M1006 a_499_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_343_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND C1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND D1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 Y D1 a_157_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_157_367# C1 a_253_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR A2 a_343_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_499_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_253_367# B1 a_343_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_343_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 Y A1 a_499_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.cdl b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.cdl
index 499e8e3..f99b914 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.cdl
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 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
+MMNB0 Y B1 VNB nfet_01v8 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
-MMPB0 pndB B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 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 pndC C1 VPB phighvt m=2 w=1.26 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.26 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.84 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.84 l=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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 Y D1 VNB nfet_01v8 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_lp__a2111oi_2
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.netlist.tsv b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.netlist.tsv
index b25cbf3..8a5e144 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.netlist.tsv
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	Y	D1	pndC	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.spice b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.spice
index 12d0cd8..4389831 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.spice
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__a2111oi_2 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 a_684_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=6.972e+11p pd=5.02e+06u as=1.1886e+12p ps=1.123e+07u
-M1001 a_467_367# B1 a_32_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.3734e+12p pd=1.226e+07u as=1.071e+12p ps=9.26e+06u
-M1002 VPWR A1 a_467_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.56e+11p pd=6.24e+06u as=0p ps=0u
-M1003 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=1.1802e+12p pd=9.53e+06u as=0p ps=0u
-M1004 a_684_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_32_367# C1 a_115_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1006 a_467_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND D1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_115_367# C1 a_32_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_115_367# D1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1010 a_32_367# B1 a_467_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y C1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A1 a_684_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_467_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y D1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y D1 a_115_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND C1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A2 a_467_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A2 a_684_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_115_367# C1 a_32_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR A2 a_467_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VGND D1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_684_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_467_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 Y D1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_467_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_32_367# C1 a_115_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_32_367# B1 a_467_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 Y D1 a_115_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_115_367# D1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 VGND A2 a_684_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_684_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_467_367# B1 a_32_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 VPWR A1 a_467_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 Y A1 a_684_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.cdl b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.cdl
index 8547ce5..fb2c756 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.cdl
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.84 l=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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=4 w=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 pndC C1 VPB phighvt m=4 w=1.26 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.26 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.84 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.84 l=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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 Y D1 VNB nfet_01v8 m=4 w=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_lp__a2111oi_4
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.netlist.tsv b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.netlist.tsv
index c38bfe0..60cdf84 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.netlist.tsv
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	Y	D1	pndC	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.spice b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.spice
index be1f6b6..49551b3 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.spice
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__a2111oi_4 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 Y D1 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=1.7262e+12p ps=1.534e+07u
-M1001 Y B1 VGND VNB nshort w=840000u l=150000u
-+  ad=1.8816e+12p pd=1.792e+07u as=2.184e+12p ps=2.032e+07u
-M1002 Y A1 a_1201_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=1.2474e+12p ps=1.137e+07u
-M1003 Y B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_1201_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A2 a_1201_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_454_367# C1 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=0p ps=0u
-M1007 a_454_367# B1 a_819_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=2.6964e+12p ps=2.192e+07u
-M1008 a_819_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.4364e+12p ps=1.236e+07u
-M1009 VGND C1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_454_367# C1 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_454_367# B1 a_819_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A2 a_819_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1201_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y D1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1201_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_367# D1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_819_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y C1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A1 a_819_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A2 a_1201_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND D1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND D1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR A1 a_819_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1201_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_27_367# D1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_819_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A1 a_1201_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_27_367# C1 a_454_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND C1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_27_367# C1 a_454_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_819_367# B1 a_454_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Y C1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_819_367# B1 a_454_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR A2 a_819_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_819_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Y D1 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 Y D1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A2 a_819_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VGND A2 a_1201_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 Y D1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Y D1 a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VGND D1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_819_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_454_367# B1 a_819_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_819_367# B1 a_454_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_27_367# D1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_819_367# B1 a_454_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_1201_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_27_367# C1 a_454_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_819_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 Y A1 a_1201_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 a_27_367# D1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 Y D1 a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 a_1201_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 a_1201_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 a_819_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 a_454_367# B1 a_819_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 VPWR A2 a_819_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 a_27_367# C1 a_454_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 a_454_367# C1 a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 a_1201_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X31 VPWR A1 a_819_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X32 a_819_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X33 Y A1 a_1201_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X34 VGND A2 a_1201_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X35 VPWR A1 a_819_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X36 Y D1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X37 VGND D1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X38 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X39 a_454_367# C1 a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.cdl b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.cdl
index f990646..2ccf775 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.cdl
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.cdl
@@ -16,30 +16,30 @@
 
 .SUBCKT sky130_fd_sc_lp__a2111oi_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPB0 pndB B1 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
+MMPC0 pndC C1 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
+MMPD0 Y D1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNB0 net75 B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 pndC C1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNC0 net72 C1 VNB nfet_01v8 m=1 w=0.42 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 nfet_01v8 m=1 w=0.42 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 l=0.25 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI10 Y C1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 net75 B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI13 net60 A2 VNB nfet_01v8 m=1 w=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 Y B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 net72 C1 VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 Y C1 VNB nshort m=1 w=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 net60 A2 VNB nshort m=1 w=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 net67 D1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 net67 D1 VNB nfet_01v8 m=1 w=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_lp__a2111oi_lp
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.netlist.tsv b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.netlist.tsv
index ad46db7..683a64b 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.netlist.tsv
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.netlist.tsv
@@ -1,15 +1,15 @@
 sky130_fd_sc_lp__a2111oi_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	Y	D1	pndC	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	net60	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	net75	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Y	B1	net75	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	net72	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	net67	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	Y	C1	net72	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	net60	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net67	D1	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	pndC	C1	pndB	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	Y	D1	pndC	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	net60	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	net75	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Y	B1	net75	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	net72	C1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	net67	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	Y	C1	net72	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	net60	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net67	D1	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/a2111oi/sky130_fd_sc_lp__a2111oi_lp.spice b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.spice
index fd511fc..7ba938e 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.spice
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.spice
@@ -16,30 +16,17 @@
 
 
 .subckt sky130_fd_sc_lp__a2111oi_lp A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 a_289_57# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.444e+11p ps=4.16e+06u
-M1001 a_553_47# C1 VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1002 a_711_47# D1 Y VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.507e+11p ps=4.19e+06u
-M1003 VGND D1 a_711_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_539_409# B1 a_131_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=5.65e+11p ps=5.13e+06u
-M1005 VGND A2 a_125_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1006 a_131_409# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=5.55e+11p ps=5.11e+06u
-M1007 a_637_409# C1 a_539_409# VPB phighvt w=1e+06u l=250000u
-+  ad=3.2e+11p pd=2.64e+06u as=0p ps=0u
-M1008 a_125_57# A1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B1 a_289_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y C1 a_553_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y D1 a_637_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1012 VPWR A2 a_131_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND C1 a_553_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR A1 a_131_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_125_57# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_553_47# C1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 Y D1 a_711_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 Y A1 a_125_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_131_409# B1 a_539_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_539_409# C1 a_637_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_637_409# D1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 VGND B1 a_289_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_131_409# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 a_289_57# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_711_47# D1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.cdl b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.cdl
index dfbbf54..f147bde 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.cdl
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a2111oi_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=0.42 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=0.42 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=0.42 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.42 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.42 l=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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 Y D1 VNB nfet_01v8 m=1 w=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_lp__a2111oi_m
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.netlist.tsv b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.netlist.tsv
index cafd625..1ae3a59e 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.netlist.tsv
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a2111oi_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	pndC	C1	pndB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	Y	D1	pndC	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	pndC	C1	pndB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	Y	D1	pndC	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	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/a2111oi/sky130_fd_sc_lp__a2111oi_m.spice b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.spice
index efcba81..f2d7bae 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.spice
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a2111oi_m A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 a_155_533# D1 Y VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.058e+11p ps=1.82e+06u
-M1001 Y B1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=4.515e+11p ps=4.67e+06u
-M1002 VGND A2 a_443_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1003 VGND C1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A1 a_299_533# VPB phighvt w=420000u l=150000u
-+  ad=2.1e+11p pd=1.84e+06u as=2.289e+11p ps=2.77e+06u
-M1005 a_443_47# A1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_299_533# A2 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_227_533# C1 a_155_533# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1008 a_299_533# B1 a_227_533# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y D1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_299_533# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 Y D1 a_155_533# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VPWR A2 a_299_533# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 Y A1 a_443_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_155_533# C1 a_227_533# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_227_533# B1 a_299_533# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_443_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND D1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_0.cdl b/cells/a211o/sky130_fd_sc_lp__a211o_0.cdl
index ebb88e7..14c1632 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_0.cdl
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a211o_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPB0 pndB B1 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
+MMPC0 y C1 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
+MMIPX X y 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
-MMPA1 pndA A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.42 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=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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a211o_0
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_0.netlist.tsv b/cells/a211o/sky130_fd_sc_lp__a211o_0.netlist.tsv
index 15728e4..26508c6 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_0.netlist.tsv
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a211o_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a211o/sky130_fd_sc_lp__a211o_0.spice b/cells/a211o/sky130_fd_sc_lp__a211o_0.spice
index ec870bd..d0d5d1e 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_0.spice
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a211o_0 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 a_80_172# C1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=5.208e+11p ps=4.16e+06u
-M1001 a_265_60# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1002 a_80_172# A1 a_265_60# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND B1 a_80_172# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_487_482# B1 a_224_482# VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=3.488e+11p ps=3.65e+06u
-M1005 a_80_172# C1 a_487_482# VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1006 a_224_482# A1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.744e+11p ps=3.73e+06u
-M1007 VGND a_80_172# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1008 VPWR A2 a_224_482# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_80_172# X VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
+X0 X a_80_172# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_265_60# A1 a_80_172# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND A2 a_265_60# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 X a_80_172# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 a_80_172# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR A1 a_224_482# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 a_224_482# B1 a_487_482# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 a_487_482# C1 a_80_172# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 VGND C1 a_80_172# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_224_482# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_1.cdl b/cells/a211o/sky130_fd_sc_lp__a211o_1.cdl
index 53fa418..1c2026a 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_1.cdl
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.26 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.84 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.84 l=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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a211o_1
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_1.netlist.tsv b/cells/a211o/sky130_fd_sc_lp__a211o_1.netlist.tsv
index d794b20..3ec8d17 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_1.netlist.tsv
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_1.spice b/cells/a211o/sky130_fd_sc_lp__a211o_1.spice
index 9ffa531..f8684ab 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_1.spice
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a211o_1 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 a_80_237# C1 a_504_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=3.402e+11p ps=3.06e+06u
-M1001 a_80_237# A1 a_294_47# VNB nshort w=840000u l=150000u
-+  ad=5.754e+11p pd=4.73e+06u as=2.016e+11p ps=2.16e+06u
-M1002 a_294_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=9.156e+11p ps=5.54e+06u
-M1003 VPWR A2 a_217_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.875e+11p pd=6.29e+06u as=7.875e+11p ps=6.29e+06u
-M1004 a_217_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_504_367# B1 a_217_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND B1 a_80_237# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_80_237# C1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_80_237# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1009 VGND a_80_237# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
+X0 a_80_237# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND A2 a_294_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VGND C1 a_80_237# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VPWR A1 a_217_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 X a_80_237# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_504_367# C1 a_80_237# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_217_367# B1 a_504_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_294_47# A1 a_80_237# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 X a_80_237# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_217_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_2.cdl b/cells/a211o/sky130_fd_sc_lp__a211o_2.cdl
index 4aece14..741c8ff 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_2.cdl
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.26 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.84 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.84 l=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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 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_lp__a211o_2
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_2.netlist.tsv b/cells/a211o/sky130_fd_sc_lp__a211o_2.netlist.tsv
index f9d4d52..1b385fa 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_2.netlist.tsv
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_2.spice b/cells/a211o/sky130_fd_sc_lp__a211o_2.spice
index 0030b8e..8376bb0 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_2.spice
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a211o_2 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 a_303_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.497e+11p pd=6.23e+06u as=1.1592e+12p ps=9.4e+06u
-M1001 a_80_21# C1 VGND VNB nshort w=840000u l=150000u
-+  ad=6.426e+11p pd=4.89e+06u as=1.1298e+12p ps=7.73e+06u
-M1002 X a_80_21# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1003 VPWR a_80_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1004 VGND a_80_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_386_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1006 a_80_21# C1 a_590_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=3.402e+11p ps=3.06e+06u
-M1007 a_80_21# A1 a_386_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_590_367# B1 a_303_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A2 a_303_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B1 a_80_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_80_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_386_47# A1 a_80_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_80_21# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VGND C1 a_80_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND a_80_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND A2 a_386_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR a_80_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_590_367# C1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR A1 a_303_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_303_367# B1 a_590_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_303_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_4.cdl b/cells/a211o/sky130_fd_sc_lp__a211o_4.cdl
index 801c590..f27096e 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_4.cdl
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 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
-MMPB0 pndB B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 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
+MMNB0 y B1 VNB nfet_01v8 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 y C1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 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 phighvt m=4 w=1.26 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.84 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.84 l=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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=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_lp__a211o_4
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_4.netlist.tsv b/cells/a211o/sky130_fd_sc_lp__a211o_4.netlist.tsv
index 37d9170..94f8684 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_4.netlist.tsv
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_4.spice b/cells/a211o/sky130_fd_sc_lp__a211o_4.spice
index 991aeb0..06e2fdf 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_4.spice
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_lp__a211o_4 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 a_610_367# C1 a_103_263# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.56e+11p pd=6.24e+06u as=3.528e+11p ps=3.08e+06u
-M1001 VPWR a_103_263# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.8648e+12p pd=1.556e+07u as=7.056e+11p ps=6.16e+06u
-M1002 VGND B1 a_103_263# VNB nshort w=840000u l=150000u
-+  ad=1.6716e+12p pd=1.406e+07u as=7.182e+11p ps=6.75e+06u
-M1003 VPWR A1 a_527_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.512e+12p ps=1.248e+07u
-M1004 VGND C1 a_103_263# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A2 a_527_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_103_263# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_103_263# VGND VNB nshort w=840000u l=150000u
-+  ad=4.83e+11p pd=4.51e+06u as=0p ps=0u
-M1008 VGND a_103_263# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1006_47# A1 a_103_263# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1010 a_103_263# C1 a_610_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_527_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_1006_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_103_263# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_103_263# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_610_367# B1 a_527_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_103_263# B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A2 a_1006_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_527_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_103_263# C1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_103_263# A1 a_1006_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_103_263# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_527_367# B1 a_610_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_103_263# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A2 a_527_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND B1 a_103_263# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VGND a_103_263# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VGND A2 a_1006_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 X a_103_263# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPWR a_103_263# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_527_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_103_263# C1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_610_367# B1 a_527_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_610_367# C1 a_103_263# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_527_367# B1 a_610_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VPWR a_103_263# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 X a_103_263# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 VGND C1 a_103_263# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_103_263# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_103_263# C1 a_610_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_1006_47# A1 a_103_263# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_527_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VPWR A1 a_527_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VGND a_103_263# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 X a_103_263# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 a_103_263# A1 a_1006_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 X a_103_263# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_1006_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_lp.cdl b/cells/a211o/sky130_fd_sc_lp__a211o_lp.cdl
index 8c7cc24..9653876 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_lp.cdl
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_lp.cdl
@@ -16,30 +16,30 @@
 
 .SUBCKT sky130_fd_sc_lp__a211o_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPB0 pndB B1 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
+MMPC0 y C1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIPX X y 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
-MMPB0 pndB B1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 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
-MMIPX X y 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
-MMNA0 y A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 net85 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 net85 A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net80 B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI11 net72 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net80 B1 VNB nshort m=1 w=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 net72 y VNB nshort m=1 w=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 net76 C1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net76 C1 VNB nfet_01v8 m=1 w=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_lp__a211o_lp
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_lp.netlist.tsv b/cells/a211o/sky130_fd_sc_lp__a211o_lp.netlist.tsv
index b2a8955..fab7293 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_lp.netlist.tsv
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_lp.netlist.tsv
@@ -1,15 +1,15 @@
 sky130_fd_sc_lp__a211o_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	net85	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	net85	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	net80	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	net76	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	net72	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net80	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net72	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net76	C1	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	net85	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	net85	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	net80	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	net76	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	net72	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net80	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net72	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net76	C1	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/a211o/sky130_fd_sc_lp__a211o_lp.spice b/cells/a211o/sky130_fd_sc_lp__a211o_lp.spice
index 0c6726f..95e7449 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_lp.spice
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_lp.spice
@@ -16,30 +16,17 @@
 
 
 .subckt sky130_fd_sc_lp__a211o_lp A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 VPWR A1 a_29_409# VPB phighvt w=1e+06u l=250000u
-+  ad=6.15e+11p pd=5.23e+06u as=5.65e+11p ps=5.13e+06u
-M1001 a_130_57# A1 a_43_57# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.373e+11p ps=2.81e+06u
-M1002 a_294_57# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.352e+11p ps=2.8e+06u
-M1003 a_43_57# B1 a_294_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND C1 a_452_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1005 a_358_409# B1 a_29_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1006 X a_43_57# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1007 a_452_57# C1 a_43_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_610_57# a_43_57# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1009 a_29_409# A2 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_43_57# a_610_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1011 a_43_57# C1 a_358_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1012 VGND A2 a_130_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_610_57# a_43_57# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR A2 a_29_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_29_409# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_43_57# A1 a_130_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_294_57# B1 a_43_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_43_57# C1 a_452_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_452_57# C1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_43_57# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 VGND a_43_57# a_610_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_358_409# C1 a_43_57# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 a_130_57# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND B1 a_294_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_29_409# B1 a_358_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_m.cdl b/cells/a211o/sky130_fd_sc_lp__a211o_m.cdl
index e32eff3..d370695 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_m.cdl
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a211o_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.42 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=0.42 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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a211o_m
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_m.netlist.tsv b/cells/a211o/sky130_fd_sc_lp__a211o_m.netlist.tsv
index 313f9bd..ae2280f 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_m.netlist.tsv
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a211o_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a211o/sky130_fd_sc_lp__a211o_m.spice b/cells/a211o/sky130_fd_sc_lp__a211o_m.spice
index 7bcdd83..ca9d778 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_m.spice
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a211o_m A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 VGND B1 a_82_483# VNB nshort w=420000u l=150000u
-+  ad=5.145e+11p pd=4.13e+06u as=2.289e+11p ps=2.77e+06u
-M1001 a_322_145# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1002 VPWR A2 a_225_389# VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=2.289e+11p ps=2.77e+06u
-M1003 a_480_389# B1 a_225_389# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 a_82_483# C1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_82_483# C1 a_480_389# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 VPWR a_82_483# X VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 VGND a_82_483# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1008 a_225_389# A1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_82_483# A1 a_322_145# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND C1 a_82_483# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND A2 a_322_145# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_82_483# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 X a_82_483# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_225_389# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VPWR A1 a_225_389# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 X a_82_483# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_225_389# B1 a_480_389# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_480_389# C1 a_82_483# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_322_145# A1 a_82_483# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_0.cdl b/cells/a211oi/sky130_fd_sc_lp__a211oi_0.cdl
index 04030a9..a8577b3 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_0.cdl
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_0.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__a211oi_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPB0 pndB B1 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
+MMPC0 Y C1 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
+MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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=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=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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=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_lp__a211oi_0
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_0.netlist.tsv b/cells/a211oi/sky130_fd_sc_lp__a211oi_0.netlist.tsv
index 9f53e53..d2963ed 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_0.netlist.tsv
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_0.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__a211oi_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	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/a211oi/sky130_fd_sc_lp__a211oi_0.spice b/cells/a211oi/sky130_fd_sc_lp__a211oi_0.spice
index 96ede55..1fab9ef 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_0.spice
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_0.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__a211oi_0 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_148_47# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.289e+11p ps=2.77e+06u
-M1001 VGND B1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.717e+11p ps=3.45e+06u
-M1002 a_312_483# B1 a_57_483# VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=3.488e+11p ps=3.65e+06u
-M1003 VPWR A2 a_57_483# VPB phighvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1004 Y C1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_57_483# A1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y C1 a_312_483# VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1007 Y A1 a_148_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_57_483# B1 a_312_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 VGND A2 a_148_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_148_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_57_483# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_312_483# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 VPWR A1 a_57_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_1.cdl b/cells/a211oi/sky130_fd_sc_lp__a211oi_1.cdl
index abd417b..8b79bea 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_1.cdl
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=1.26 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.26 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.84 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.84 l=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a211oi_1
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_1.netlist.tsv b/cells/a211oi/sky130_fd_sc_lp__a211oi_1.netlist.tsv
index 9b2b9b4..28efdeb 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_1.netlist.tsv
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_1.spice b/cells/a211oi/sky130_fd_sc_lp__a211oi_1.spice
index cdb1783..8be296a 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_1.spice
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__a211oi_1 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_27_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=8.253e+11p pd=6.35e+06u as=4.914e+11p ps=3.3e+06u
-M1001 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=5.502e+11p pd=4.67e+06u as=5.502e+11p ps=4.67e+06u
-M1002 a_110_49# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1003 a_326_367# B1 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1004 Y C1 a_326_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1005 Y C1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A2 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A1 a_110_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_110_49# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND A2 a_110_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_27_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_27_367# B1 a_326_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_326_367# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VPWR A1 a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_2.cdl b/cells/a211oi/sky130_fd_sc_lp__a211oi_2.cdl
index 104d578..5883891 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_2.cdl
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 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
+MMNB0 Y B1 VNB nfet_01v8 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
-MMPB0 pndB B1 VPB phighvt m=2 w=1.26 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.26 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.84 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.84 l=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 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_lp__a211oi_2
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_2.netlist.tsv b/cells/a211oi/sky130_fd_sc_lp__a211oi_2.netlist.tsv
index a38de20..bda4f6c 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_2.netlist.tsv
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_2.spice b/cells/a211oi/sky130_fd_sc_lp__a211oi_2.spice
index fb524e0..7ff7b07 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_2.spice
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__a211oi_2 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 VPWR A2 a_296_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0206e+12p pd=9.18e+06u as=1.0584e+12p ps=9.24e+06u
-M1001 a_41_367# B1 a_296_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0206e+12p pd=9.18e+06u as=0p ps=0u
-M1002 a_489_65# A1 Y VNB nshort w=840000u l=150000u
-+  ad=6.804e+11p pd=6.66e+06u as=7.728e+11p ps=6.88e+06u
-M1003 VPWR A1 a_296_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A2 a_489_65# VNB nshort w=840000u l=150000u
-+  ad=1.05e+12p pd=9.22e+06u as=0p ps=0u
-M1005 a_489_65# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_296_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y C1 a_41_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1009 a_296_367# B1 a_41_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_296_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND C1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y C1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_41_367# C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A1 a_489_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_296_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_296_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_296_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_41_367# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_41_367# B1 a_296_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 Y C1 a_41_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND A2 a_489_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_489_65# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_296_367# B1 a_41_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_489_65# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VPWR A2 a_296_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 Y A1 a_489_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_4.cdl b/cells/a211oi/sky130_fd_sc_lp__a211oi_4.cdl
index af4e445..3e9dc57 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_4.cdl
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.84 l=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.84 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.26 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.26 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.84 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.84 l=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=4 w=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_lp__a211oi_4
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_4.netlist.tsv b/cells/a211oi/sky130_fd_sc_lp__a211oi_4.netlist.tsv
index 592a430..6642192 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_4.netlist.tsv
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_4.spice b/cells/a211oi/sky130_fd_sc_lp__a211oi_4.spice
index b1829c9..ad31aa9 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_4.spice
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_lp__a211oi_4 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 VGND C1 Y VNB nshort w=840000u l=150000u
-+  ad=1.7136e+12p pd=1.584e+07u as=1.4112e+12p ps=1.344e+07u
-M1001 VGND C1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A1 a_114_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=9.408e+11p ps=8.96e+06u
-M1003 Y A1 a_114_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A2 a_45_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4742e+12p pd=1.242e+07u as=2.457e+12p ps=2.154e+07u
-M1005 a_45_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A2 a_114_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_45_367# B1 a_826_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.4112e+12p ps=1.232e+07u
-M1008 a_114_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A2 a_45_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_826_367# C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1011 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_45_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y C1 a_826_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y C1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_114_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A1 a_45_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_45_367# B1 a_826_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_45_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_826_367# B1 a_45_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y C1 a_826_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y C1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A2 a_114_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_114_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR A1 a_45_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_114_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_45_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_826_367# B1 a_45_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_826_367# C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A1 a_114_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_114_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_826_367# B1 a_45_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND A2 a_114_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_826_367# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 Y A1 a_114_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VPWR A1 a_45_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_45_367# B1 a_826_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_45_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_826_367# B1 a_45_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_826_367# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 Y C1 a_826_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_45_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_114_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 VPWR A2 a_45_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_45_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 Y C1 a_826_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 VPWR A2 a_45_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 VGND A2 a_114_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_114_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 a_114_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 VPWR A1 a_45_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 a_45_367# B1 a_826_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X30 a_45_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.cdl b/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.cdl
index 0dc5aaf..0068107 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.cdl
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a211oi_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPB0 pndB B1 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
+MMPC0 Y C1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNB0 net53 B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MI10 net66 A2 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNB0 net53 B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net69 C1 VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net66 A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net69 C1 VNB nshort m=1 w=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 Y A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI8 Y B1 VNB nshort m=1 w=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_lp__a211oi_lp
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.netlist.tsv b/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.netlist.tsv
index a4f3f99..591508e 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.netlist.tsv
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a211oi_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	net53	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	net69	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net66	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net69	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Y	A1	net66	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Y	B1	net53	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	net53	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	net69	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net66	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net69	C1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Y	A1	net66	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Y	B1	net53	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.spice b/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.spice
index 770ecec..68e641b 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.spice
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a211oi_lp A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_295_57# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.373e+11p ps=2.81e+06u
-M1001 Y B1 a_295_57# VNB nshort w=420000u l=150000u
-+  ad=2.373e+11p pd=2.81e+06u as=0p ps=0u
-M1002 a_279_409# B1 a_181_409# VPB phighvt w=1e+06u l=250000u
-+  ad=6.05e+11p pd=5.21e+06u as=2.4e+11p ps=2.48e+06u
-M1003 a_453_57# A1 Y VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1004 a_181_409# C1 Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=4.9e+11p ps=2.98e+06u
-M1005 VGND C1 a_137_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1006 a_279_409# A2 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=5.8e+11p ps=3.16e+06u
-M1007 VPWR A1 a_279_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_137_57# C1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A2 a_453_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_295_57# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 Y A1 a_453_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_181_409# B1 a_279_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 Y C1 a_137_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR A2 a_279_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 Y C1 a_181_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_137_57# C1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_453_57# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND B1 a_295_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_279_409# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_m.cdl b/cells/a211oi/sky130_fd_sc_lp__a211oi_m.cdl
index baf602f..a37c090 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_m.cdl
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_m.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__a211oi_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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=0.42 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=0.42 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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=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_lp__a211oi_m
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_m.netlist.tsv b/cells/a211oi/sky130_fd_sc_lp__a211oi_m.netlist.tsv
index 9f019bc..fc2caac 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_m.netlist.tsv
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_m.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__a211oi_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	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/a211oi/sky130_fd_sc_lp__a211oi_m.spice b/cells/a211oi/sky130_fd_sc_lp__a211oi_m.spice
index 0b90fd2..cfc7d22 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_m.spice
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_m.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__a211oi_m A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 Y C1 a_314_369# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.134e+11p ps=1.38e+06u
-M1001 Y A1 a_110_47# VNB nshort w=420000u l=150000u
-+  ad=2.751e+11p pd=2.99e+06u as=8.82e+10p ps=1.26e+06u
-M1002 a_314_369# B1 a_27_369# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.499e+11p ps=2.87e+06u
-M1003 VGND B1 Y VNB nshort w=420000u l=150000u
-+  ad=2.751e+11p pd=2.99e+06u as=0p ps=0u
-M1004 VPWR A2 a_27_369# VPB phighvt w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1005 a_110_47# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_369# A1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y C1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_369# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_110_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND A2 a_110_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_314_369# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VPWR A1 a_27_369# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_27_369# B1 a_314_369# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_0.cdl b/cells/a21bo/sky130_fd_sc_lp__a21bo_0.cdl
index 793acca..ff7d3c7 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_0.cdl
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a21bo_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPB0 y B1 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
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=0.42 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=0.64 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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.42 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=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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a21bo_0
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_0.netlist.tsv b/cells/a21bo/sky130_fd_sc_lp__a21bo_0.netlist.tsv
index ce720d9..dc8fa1f 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_0.netlist.tsv
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a21bo_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	0.64	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a21bo/sky130_fd_sc_lp__a21bo_0.spice b/cells/a21bo/sky130_fd_sc_lp__a21bo_0.spice
index 54e0017..03fe22b 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_0.spice
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a21bo_0 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 VGND A2 a_533_52# VNB nshort w=420000u l=150000u
-+  ad=3.402e+11p pd=4.14e+06u as=1.596e+11p ps=1.6e+06u
-M1001 a_467_458# a_216_526# a_72_212# VPB phighvt w=640000u l=150000u
-+  ad=3.488e+11p pd=3.65e+06u as=1.696e+11p ps=1.81e+06u
-M1002 VPWR a_72_212# X VPB phighvt w=640000u l=150000u
-+  ad=3.95e+11p pd=3.87e+06u as=1.696e+11p ps=1.81e+06u
-M1003 a_467_458# A2 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_72_212# a_216_526# VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1005 a_216_526# B1_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 VPWR A1 a_467_458# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_72_212# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1008 a_216_526# B1_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1009 a_533_52# A1 a_72_212# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B1_N a_216_526# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR A2 a_467_458# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_467_458# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 VPWR B1_N a_216_526# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 X a_72_212# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_533_52# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_216_526# a_72_212# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_72_212# A1 a_533_52# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 X a_72_212# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 a_72_212# a_216_526# a_467_458# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_1.cdl b/cells/a21bo/sky130_fd_sc_lp__a21bo_1.cdl
index 4649b3d..0bbe5f6 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_1.cdl
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.42 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB phighvt m=1 w=0.42 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.26 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.84 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.84 l=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.84 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a21bo_1
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_1.netlist.tsv b/cells/a21bo/sky130_fd_sc_lp__a21bo_1.netlist.tsv
index 1d79238..2f91a70 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_1.netlist.tsv
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_1.spice b/cells/a21bo/sky130_fd_sc_lp__a21bo_1.spice
index e6fbf78..602cf6b 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_1.spice
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a21bo_1 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 a_436_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.867e+11p pd=6.13e+06u as=8.589e+11p ps=6.55e+06u
-M1001 a_436_367# a_237_367# a_80_43# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1002 a_237_367# B1_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.651e+11p ps=7.38e+06u
-M1003 a_556_47# A1 a_80_43# VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=3.78e+11p ps=2.58e+06u
-M1004 VPWR A1 a_436_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_80_43# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1006 a_237_367# B1_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1007 a_80_43# a_237_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_556_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_80_43# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 a_436_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_80_43# A1 a_556_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_80_43# a_237_367# a_436_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_556_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 X a_80_43# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND B1_N a_237_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR A2 a_436_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 X a_80_43# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VPWR B1_N a_237_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VGND a_237_367# a_80_43# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_2.cdl b/cells/a21bo/sky130_fd_sc_lp__a21bo_2.cdl
index c1f2028..2e29fb8 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_2.cdl
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.42 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB phighvt m=1 w=0.42 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.26 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.84 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.84 l=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.84 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 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_lp__a21bo_2
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_2.netlist.tsv b/cells/a21bo/sky130_fd_sc_lp__a21bo_2.netlist.tsv
index 976b123..7de9c4e 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_2.netlist.tsv
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_2.spice b/cells/a21bo/sky130_fd_sc_lp__a21bo_2.spice
index 54594d5..6255ab1 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_2.spice
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a21bo_2 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 VGND a_22_259# X VNB nshort w=840000u l=150000u
-+  ad=9.366e+11p pd=9.06e+06u as=2.352e+11p ps=2.24e+06u
-M1001 VPWR a_22_259# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.1256e+12p pd=9.52e+06u as=3.528e+11p ps=3.08e+06u
-M1002 a_304_153# B1_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.281e+11p pd=1.45e+06u as=0p ps=0u
-M1003 a_508_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.867e+11p pd=6.13e+06u as=0p ps=0u
-M1004 a_304_153# B1_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.281e+11p pd=1.45e+06u as=0p ps=0u
-M1005 VPWR A1 a_508_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_22_259# a_304_153# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1007 X a_22_259# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_22_259# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A2 a_594_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.688e+11p ps=2.32e+06u
-M1010 a_508_367# a_304_153# a_22_259# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1011 a_594_47# A1 a_22_259# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_508_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND a_304_153# a_22_259# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_22_259# A1 a_594_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VGND B1_N a_304_153# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR B1_N a_304_153# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 X a_22_259# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 X a_22_259# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VPWR a_22_259# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR A2 a_508_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_22_259# a_304_153# a_508_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VGND a_22_259# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_594_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_4.cdl b/cells/a21bo/sky130_fd_sc_lp__a21bo_4.cdl
index 391ff57..8cebbdb 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_4.cdl
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 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
-MMPB0 y B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 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
+MMNB0 y B1 VNB nfet_01v8 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 phighvt m=1 w=1.26 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.26 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.84 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.84 l=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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=4 w=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_lp__a21bo_4
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_4.netlist.tsv b/cells/a21bo/sky130_fd_sc_lp__a21bo_4.netlist.tsv
index d94e7b6..fb3ac30 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_4.netlist.tsv
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	2	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_4.spice b/cells/a21bo/sky130_fd_sc_lp__a21bo_4.spice
index 3adc290..4a08bbb 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_4.spice
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_4.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_lp__a21bo_4 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 VPWR a_188_315# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7955e+12p pd=1.545e+07u as=7.056e+11p ps=6.16e+06u
-M1001 X a_188_315# VGND VNB nshort w=840000u l=150000u
-+  ad=4.788e+11p pd=4.5e+06u as=1.9152e+12p ps=1.296e+07u
-M1002 a_908_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1003 X a_188_315# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_188_315# a_42_47# a_645_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=1.3734e+12p ps=1.226e+07u
-M1005 a_188_315# a_42_47# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1006 a_645_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_908_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A2 a_645_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_188_315# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_645_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_188_315# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_188_315# A1 a_908_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND B1_N a_42_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1014 a_908_47# A1 a_188_315# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A1 a_645_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_188_315# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_645_367# a_42_47# a_188_315# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_188_315# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_188_315# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_42_47# a_188_315# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR B1_N a_42_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 a_188_315# a_42_47# a_645_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 X a_188_315# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VGND a_188_315# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 X a_188_315# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_645_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 X a_188_315# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VPWR a_188_315# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_42_47# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND a_42_47# a_188_315# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_188_315# A1 a_908_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_42_47# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_188_315# a_42_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_908_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 X a_188_315# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 VGND A2 a_908_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_645_367# a_42_47# a_188_315# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_908_47# A1 a_188_315# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 VPWR a_188_315# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VPWR A2 a_645_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_645_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 VPWR A1 a_645_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 VGND a_188_315# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.cdl b/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.cdl
index 102f35d..dc85103 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.cdl
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.cdl
@@ -16,30 +16,30 @@
 
 .SUBCKT sky130_fd_sc_lp__a21bo_lp 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINB1N net81 B1_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMPA0 pndA A1 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
-MI7 net77 B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA1 pndA A2 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
+MMPB0 y B1 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
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPB1N B1 B1_N 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
+MMIPX X y 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
-MI10 net72 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net65 A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 B1 B1_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINB1N net81 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net77 B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net72 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net65 A2 VNB nfet_01v8 m=1 w=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 B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a21bo_lp
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.netlist.tsv b/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.netlist.tsv
index b080cc0..f488a21 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.netlist.tsv
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.netlist.tsv
@@ -1,15 +1,15 @@
 sky130_fd_sc_lp__a21bo_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	net65	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	net77	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	net81	B1_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net77	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	net72	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net72	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net65	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	B1	B1_N	net81	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1	0.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	net65	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	net77	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	net81	B1_N	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net77	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	net72	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net72	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net65	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	B1	B1_N	net81	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.spice b/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.spice
index 77a77cf..924890c 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.spice
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.spice
@@ -16,30 +16,17 @@
 
 
 .subckt sky130_fd_sc_lp__a21bo_lp A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 a_436_55# a_308_364# a_84_29# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1001 VGND a_84_29# a_114_55# VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=8.82e+10p ps=1.26e+06u
-M1002 a_594_55# B1_N VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1003 a_308_364# B1_N a_594_55# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1004 VPWR a_84_29# X VPB phighvt w=1e+06u l=250000u
-+  ad=5.7e+11p pd=5.14e+06u as=2.85e+11p ps=2.57e+06u
-M1005 a_308_364# B1_N VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1006 a_84_29# a_308_364# a_252_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=5.65e+11p ps=5.13e+06u
-M1007 a_114_55# a_84_29# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1008 a_272_55# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1009 a_84_29# A1 a_272_55# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A1 a_252_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_252_409# A2 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_308_364# a_436_55# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_84_29# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 VPWR B1_N a_308_364# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 VPWR A2 a_252_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_272_55# A1 a_84_29# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_252_409# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_594_55# B1_N a_308_364# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_84_29# a_308_364# a_436_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_114_55# a_84_29# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 X a_84_29# a_114_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND A2 a_272_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_436_55# a_308_364# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND B1_N a_594_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_252_409# a_308_364# a_84_29# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_m.cdl b/cells/a21bo/sky130_fd_sc_lp__a21bo_m.cdl
index 44c444c..f279df5 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_m.cdl
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a21bo_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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.42 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=0.42 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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a21bo_m
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_m.netlist.tsv b/cells/a21bo/sky130_fd_sc_lp__a21bo_m.netlist.tsv
index 70d9218..b633167 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_m.netlist.tsv
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a21bo_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a21bo/sky130_fd_sc_lp__a21bo_m.spice b/cells/a21bo/sky130_fd_sc_lp__a21bo_m.spice
index 8e7973f..940972e 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_m.spice
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a21bo_m A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 a_80_72# a_196_98# VGND VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=3.549e+11p ps=4.21e+06u
-M1001 a_196_98# B1_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=2.352e+11p ps=2.8e+06u
-M1002 VGND a_80_72# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1003 a_419_439# a_196_98# a_80_72# VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=1.113e+11p ps=1.37e+06u
-M1004 a_499_47# A1 a_80_72# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1005 VGND A2 a_499_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_196_98# B1_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1007 a_419_439# A2 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_80_72# X VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1009 VPWR A1 a_419_439# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B1_N a_196_98# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_80_72# a_196_98# a_419_439# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 X a_80_72# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_419_439# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VPWR B1_N a_196_98# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_499_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR A2 a_419_439# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 X a_80_72# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VGND a_196_98# a_80_72# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_80_72# A1 a_499_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_0.cdl b/cells/a21boi/sky130_fd_sc_lp__a21boi_0.cdl
index 66920b4..309ea66 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_0.cdl
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_0.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__a21boi_0 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 net38 A1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 net38 A1 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
+MMPA1 net38 A2 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
+MMPB0 Y B1 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
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 net38 A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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=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.42 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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a21boi_0
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_0.netlist.tsv b/cells/a21boi/sky130_fd_sc_lp__a21boi_0.netlist.tsv
index 979c221..dc8ef6c 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_0.netlist.tsv
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_0.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__a21boi_0	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	net38	A1	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	net38	A2	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	net38	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	net38	A1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	net38	A2	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	net38	VPB	pfet_01v8_hvt	1	0.64	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_0.spice b/cells/a21boi/sky130_fd_sc_lp__a21boi_0.spice
index ffdbf2e..92e2272 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_0.spice
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_0.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__a21boi_0 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 a_350_47# A1 Y VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1001 a_324_483# a_27_47# Y VPB phighvt w=640000u l=150000u
-+  ad=3.488e+11p pd=3.65e+06u as=1.696e+11p ps=1.81e+06u
-M1002 VGND B1_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=3.717e+11p pd=3.45e+06u as=1.113e+11p ps=1.37e+06u
-M1003 a_324_483# A2 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.905e+11p ps=3.21e+06u
-M1004 VPWR B1_N a_27_47# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 VPWR A1 a_324_483# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_350_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A2 a_324_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_27_47# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_324_483# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_27_47# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VGND a_27_47# Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 Y A1 a_350_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_350_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 Y a_27_47# a_324_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_1.cdl b/cells/a21boi/sky130_fd_sc_lp__a21boi_1.cdl
index b27ccfd..5eb09ce 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_1.cdl
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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 net38 A1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 net38 A1 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 net38 A2 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.42 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 net38 A2 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB phighvt m=1 w=1.26 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.42 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.84 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.84 l=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.84 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a21boi_1
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_1.netlist.tsv b/cells/a21boi/sky130_fd_sc_lp__a21boi_1.netlist.tsv
index 88e09b1..79bad41 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_1.netlist.tsv
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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	net38	A1	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	net38	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	net38	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	net38	A1	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	net38	A2	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	net38	VPB	pfet_01v8_hvt	1	1.26	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_1.spice b/cells/a21boi/sky130_fd_sc_lp__a21boi_1.spice
index bf4ed98..8796819 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_1.spice
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__a21boi_1 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 a_302_367# a_27_508# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.867e+11p pd=6.13e+06u as=3.339e+11p ps=3.05e+06u
-M1001 VPWR B1_N a_27_508# VPB phighvt w=420000u l=150000u
-+  ad=5.901e+11p pd=4.65e+06u as=1.113e+11p ps=1.37e+06u
-M1002 VGND B1_N a_27_508# VNB nshort w=420000u l=150000u
-+  ad=4.914e+11p pd=4.64e+06u as=1.113e+11p ps=1.37e+06u
-M1003 a_302_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y a_27_508# VGND VNB nshort w=840000u l=150000u
-+  ad=2.898e+11p pd=2.37e+06u as=0p ps=0u
-M1005 a_380_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=3.528e+11p pd=2.52e+06u as=0p ps=0u
-M1006 VPWR A1 a_302_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_380_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_302_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 Y a_27_508# a_302_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 Y A1 a_380_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VGND a_27_508# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_27_508# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_380_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_27_508# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VPWR A2 a_302_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_2.cdl b/cells/a21boi/sky130_fd_sc_lp__a21boi_2.cdl
index e373951..c6bf87d 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_2.cdl
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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 net28 A1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 net28 A1 VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 net28 A2 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.42 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 net28 A2 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 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
+MMNB0 Y B1 VNB nfet_01v8 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
-MMPB0 Y B1 VPB phighvt m=2 w=1.26 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.42 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.84 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.84 l=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.84 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a21boi_2
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_2.netlist.tsv b/cells/a21boi/sky130_fd_sc_lp__a21boi_2.netlist.tsv
index 4cfc0d8..55aafcb 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_2.netlist.tsv
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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	net28	A1	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	net28	A2	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	net28	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	net28	A1	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	net28	A2	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	net28	VPB	pfet_01v8_hvt	2	1.26	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	2	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_2.spice b/cells/a21boi/sky130_fd_sc_lp__a21boi_2.spice
index 105c01b..13c8c10 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_2.spice
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__a21boi_2 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 VPWR A1 a_231_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0185e+12p pd=7.85e+06u as=1.3734e+12p ps=1.226e+07u
-M1001 VPWR A2 a_231_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y a_119_500# VGND VNB nshort w=840000u l=150000u
-+  ad=5.376e+11p pd=4.64e+06u as=7.938e+11p ps=7.04e+06u
-M1003 Y A1 a_502_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1004 a_231_367# a_119_500# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1005 a_502_65# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_231_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_119_500# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_231_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_502_65# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y a_119_500# a_231_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_119_500# B1_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1012 VGND B1_N a_119_500# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1013 VGND A2 a_502_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A2 a_231_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_231_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_231_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 Y a_119_500# a_231_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND a_119_500# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_119_500# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 Y a_119_500# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VGND A2 a_502_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 Y A1 a_502_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VPWR B1_N a_119_500# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_502_65# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_502_65# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VPWR A1 a_231_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_231_367# a_119_500# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_4.cdl b/cells/a21boi/sky130_fd_sc_lp__a21boi_4.cdl
index 15dcf7b..d6ccef9 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_4.cdl
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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 net28 A1 VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 net28 A1 VPB pfet_01v8_hvt m=4 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 net28 A2 VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 net28 A2 VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.84 l=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.84 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.26 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.26 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.84 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.84 l=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.84 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.84 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.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_lp__a21boi_4
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_4.netlist.tsv b/cells/a21boi/sky130_fd_sc_lp__a21boi_4.netlist.tsv
index 1c1857a..e74f2f8 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_4.netlist.tsv
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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	net28	A1	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	net28	A2	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	net28	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	net28	A1	VPWR	VPB	pfet_01v8_hvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	net28	A2	VPWR	VPB	pfet_01v8_hvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	net28	VPB	pfet_01v8_hvt	4	1.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	4	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_4.spice b/cells/a21boi/sky130_fd_sc_lp__a21boi_4.spice
index cda1b35..bae59d6 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_4.spice
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_4.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_lp__a21boi_4 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 VGND a_33_367# Y VNB nshort w=840000u l=150000u
-+  ad=1.4658e+12p pd=1.189e+07u as=9.408e+11p ps=8.96e+06u
-M1001 a_223_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.4696e+12p pd=2.156e+07u as=1.7577e+12p ps=1.539e+07u
-M1002 a_223_367# a_33_367# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1003 a_658_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=9.408e+11p pd=8.96e+06u as=0p ps=0u
-M1004 VGND A2 a_658_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y a_33_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_223_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR B1_N a_33_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1008 Y A1 a_658_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_223_367# a_33_367# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_658_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A2 a_223_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A1 a_223_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A2 a_223_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B1_N a_33_367# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1015 a_658_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y a_33_367# a_223_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_33_367# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y a_33_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_223_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_658_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y A1 a_658_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y a_33_367# a_223_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A2 a_658_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_223_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_223_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_658_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND A2 a_658_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_658_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_658_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND a_33_367# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 Y A1 a_658_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_223_367# a_33_367# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 Y a_33_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_223_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR A2 a_223_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR A1 a_223_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VGND A2 a_658_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_658_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VGND a_33_367# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 Y A1 a_658_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 Y a_33_367# a_223_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_223_367# a_33_367# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 Y a_33_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_223_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_33_367# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 VPWR A1 a_223_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 a_223_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 a_33_367# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 Y a_33_367# a_223_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 VPWR A2 a_223_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 a_223_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.cdl b/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.cdl
index 07f5a75..172e82e 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.cdl
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a21boi_lp 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 net43 A1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 net43 A1 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
+MMPA1 net43 A2 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
+MMPB0 Y B1 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
-MMPA1 net43 A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIPB1N B1 B1_N 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
+MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 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
-MMIPB1N B1 B1_N VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 Y A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net62 B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI10 net51 A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net62 B1 VNB nshort m=1 w=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 net51 A2 VNB nshort m=1 w=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 net47 B1_N VNB nshort m=1 w=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 net47 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a21boi_lp
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.netlist.tsv b/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.netlist.tsv
index ea4e577..882b8c0 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.netlist.tsv
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a21boi_lp	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	net43	A1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	net43	A2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	net43	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	net51	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	net62	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	net47	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net62	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net51	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net47	B1_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	net43	A1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	net43	A2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	net43	VPB	pfet_01v8_hvt	1	1	0.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	net51	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	net62	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	net47	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net62	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net51	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net47	B1_N	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/a21boi/sky130_fd_sc_lp__a21boi_lp.spice b/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.spice
index aa9b7e7..e7b9463 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.spice
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a21boi_lp A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 Y a_298_318# a_29_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=5.65e+11p ps=5.13e+06u
-M1001 a_298_318# B1_N VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=5.65e+11p ps=5.13e+06u
-M1002 VPWR A2 a_29_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_172_47# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.772e+11p ps=3e+06u
-M1004 Y A1 a_172_47# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1005 a_29_409# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_298_318# a_336_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1007 a_513_47# B1_N VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1008 a_298_318# B1_N a_513_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1009 a_336_47# a_298_318# Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_513_47# B1_N a_298_318# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_172_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR A1 a_29_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 Y a_298_318# a_336_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND B1_N a_513_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND A2 a_172_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_336_47# a_298_318# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_29_409# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 VPWR B1_N a_298_318# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_29_409# a_298_318# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_m.cdl b/cells/a21boi/sky130_fd_sc_lp__a21boi_m.cdl
index cda7c26..b187dbc 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_m.cdl
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_m.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__a21boi_m 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 net28 A1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 net28 A1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA1 net28 A2 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 net28 A2 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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=0.42 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.42 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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a21boi_m
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_m.netlist.tsv b/cells/a21boi/sky130_fd_sc_lp__a21boi_m.netlist.tsv
index 1baa244..b808096 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_m.netlist.tsv
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_m.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__a21boi_m	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	net28	A1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	net28	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	net28	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	net28	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	net28	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	net28	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_m.spice b/cells/a21boi/sky130_fd_sc_lp__a21boi_m.spice
index d7bae9f..c508a0a 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_m.spice
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_m.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__a21boi_m A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 VPWR A1 a_306_395# VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=2.289e+11p ps=2.77e+06u
-M1001 VGND A2 a_310_47# VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=1.827e+11p ps=1.71e+06u
-M1002 VGND B1_N a_27_535# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1003 Y a_27_535# VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1004 a_306_395# a_27_535# Y VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 VPWR B1_N a_27_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 a_306_395# A2 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_310_47# A1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_535# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_310_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_27_535# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y a_27_535# a_306_395# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VPWR A2 a_306_395# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VGND a_27_535# Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_306_395# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 Y A1 a_310_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_0.cdl b/cells/a21o/sky130_fd_sc_lp__a21o_0.cdl
index 15dc886..4c71ae7 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_0.cdl
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_0.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__a21o_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPB0 y B1 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
+MMIPX X y 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
-MMPA1 pndA A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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=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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a21o_0
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_0.netlist.tsv b/cells/a21o/sky130_fd_sc_lp__a21o_0.netlist.tsv
index fd02e20..fcb439d 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_0.netlist.tsv
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_0.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__a21o_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a21o/sky130_fd_sc_lp__a21o_0.spice b/cells/a21o/sky130_fd_sc_lp__a21o_0.spice
index d905e6d..2f00fa5 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_0.spice
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_0.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__a21o_0 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 a_319_473# B1 a_80_275# VPB phighvt w=640000u l=150000u
-+  ad=3.488e+11p pd=3.65e+06u as=1.696e+11p ps=1.81e+06u
-M1001 a_319_473# A2 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.488e+11p ps=3.65e+06u
-M1002 a_80_275# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=1.449e+11p pd=1.53e+06u as=2.625e+11p ps=2.93e+06u
-M1003 VPWR a_80_275# X VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1004 a_405_47# A1 a_80_275# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1005 VGND A2 a_405_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_319_473# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_80_275# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 a_319_473# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 X a_80_275# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR A2 a_319_473# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_80_275# A1 a_405_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND B1 a_80_275# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_80_275# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 a_80_275# B1 a_319_473# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 a_405_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_1.cdl b/cells/a21o/sky130_fd_sc_lp__a21o_1.cdl
index 4b05705..6628973 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_1.cdl
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.26 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.84 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.84 l=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a21o_1
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_1.netlist.tsv b/cells/a21o/sky130_fd_sc_lp__a21o_1.netlist.tsv
index fef39b6..72299d8 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_1.netlist.tsv
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_1.spice b/cells/a21o/sky130_fd_sc_lp__a21o_1.spice
index 3f4fff4..bf6d4ba 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_1.spice
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__a21o_1 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 VGND a_80_237# X VNB nshort w=840000u l=150000u
-+  ad=7.602e+11p pd=5.17e+06u as=2.226e+11p ps=2.21e+06u
-M1001 a_300_367# B1 a_80_237# VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.867e+11p pd=6.13e+06u as=3.339e+11p ps=3.05e+06u
-M1002 a_378_47# A1 a_80_237# VNB nshort w=840000u l=150000u
-+  ad=3.528e+11p pd=2.52e+06u as=3.318e+11p ps=2.47e+06u
-M1003 a_80_237# B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_300_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=8.127e+11p ps=6.33e+06u
-M1005 VGND A2 a_378_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_300_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_80_237# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 a_378_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND B1 a_80_237# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 X a_80_237# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR A2 a_300_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_300_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_80_237# B1 a_300_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 X a_80_237# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_80_237# A1 a_378_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_2.cdl b/cells/a21o/sky130_fd_sc_lp__a21o_2.cdl
index 8c609eb..913de00 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_2.cdl
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.26 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.84 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.84 l=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 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_lp__a21o_2
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_2.netlist.tsv b/cells/a21o/sky130_fd_sc_lp__a21o_2.netlist.tsv
index fc65164..b8459f0 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_2.netlist.tsv
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_2.spice b/cells/a21o/sky130_fd_sc_lp__a21o_2.spice
index a3ffbe9..20e41e3 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_2.spice
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a21o_2 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 a_392_367# B1 a_86_269# VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.867e+11p pd=6.13e+06u as=3.339e+11p ps=3.05e+06u
-M1001 X a_86_269# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=7.392e+11p ps=6.8e+06u
-M1002 X a_86_269# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=1.071e+12p ps=9.26e+06u
-M1003 a_86_269# B1 VGND VNB nshort w=840000u l=150000u
-+  ad=4.2e+11p pd=2.68e+06u as=0p ps=0u
-M1004 a_392_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_464_47# A1 a_86_269# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=0p ps=0u
-M1006 VPWR a_86_269# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A1 a_392_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_464_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_86_269# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_86_269# A1 a_464_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_464_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VGND a_86_269# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VPWR A2 a_392_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_86_269# B1 a_392_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_392_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 X a_86_269# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VPWR a_86_269# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 X a_86_269# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VGND B1 a_86_269# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_4.cdl b/cells/a21o/sky130_fd_sc_lp__a21o_4.cdl
index 330088b..92e1cc4 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_4.cdl
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 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
-MMPB0 y B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 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
+MMNB0 y B1 VNB nfet_01v8 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 phighvt m=4 w=1.26 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.84 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.84 l=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=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_lp__a21o_4
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_4.netlist.tsv b/cells/a21o/sky130_fd_sc_lp__a21o_4.netlist.tsv
index 2a9034d..a752b49 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_4.netlist.tsv
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_4.spice b/cells/a21o/sky130_fd_sc_lp__a21o_4.spice
index 1410e96..ad282ce 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_4.spice
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_4.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__a21o_4 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 a_792_49# A1 a_134_269# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=4.704e+11p ps=4.48e+06u
-M1001 VPWR a_134_269# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7766e+12p pd=1.542e+07u as=7.056e+11p ps=6.16e+06u
-M1002 X a_134_269# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=1.5204e+12p ps=1.202e+07u
-M1003 a_792_49# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR a_134_269# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_529_367# B1 a_134_269# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.3734e+12p pd=1.226e+07u as=3.528e+11p ps=3.08e+06u
-M1006 VGND A2 a_792_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A1 a_529_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_134_269# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B1 a_134_269# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_134_269# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_134_269# B1 a_529_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_134_269# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_529_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_529_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_134_269# A1 a_792_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A2 a_529_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_134_269# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_134_269# B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_134_269# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A2 a_792_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VPWR a_134_269# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 X a_134_269# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND B1 a_134_269# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_792_49# A1 a_134_269# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_134_269# A1 a_792_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR A1 a_529_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VGND a_134_269# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_134_269# B1 a_529_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 X a_134_269# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_529_367# B1 a_134_269# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VGND a_134_269# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_134_269# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VPWR A2 a_529_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_529_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_529_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 X a_134_269# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 X a_134_269# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VPWR a_134_269# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_792_49# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_lp.cdl b/cells/a21o/sky130_fd_sc_lp__a21o_lp.cdl
index 679fa48..14d77b1 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_lp.cdl
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_lp.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a21o_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPB0 y B1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIPX X y 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
-MMPB0 y B1 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
-MMIPX X y 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
-MMNA0 y A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 net61 A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 net61 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net53 B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net53 B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=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 net45 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net45 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a21o_lp
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_lp.netlist.tsv b/cells/a21o/sky130_fd_sc_lp__a21o_lp.netlist.tsv
index afd6b23..7ea7bf6 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_lp.netlist.tsv
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_lp.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a21o_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	net61	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	net61	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	net53	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net53	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	net45	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net45	y	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	net61	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	net61	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	net53	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net53	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	net45	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net45	y	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/a21o/sky130_fd_sc_lp__a21o_lp.spice b/cells/a21o/sky130_fd_sc_lp__a21o_lp.spice
index fb196b9..7cca1e1 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_lp.spice
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_lp.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a21o_lp A1 A2 B1 VGND VNB VPB VPWR X
-M1000 X a_218_57# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=5.65e+11p ps=5.13e+06u
-M1001 a_332_57# B1 a_218_57# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.764e+11p ps=1.68e+06u
-M1002 a_490_57# a_218_57# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.373e+11p ps=2.81e+06u
-M1003 VPWR A2 a_33_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=5.65e+11p ps=5.13e+06u
-M1004 X a_218_57# a_490_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1005 a_218_57# A1 a_140_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1006 a_140_57# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_218_57# B1 a_33_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1008 a_33_409# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B1 a_332_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_218_57# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_218_57# B1 a_332_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_490_57# a_218_57# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND A2 a_140_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_332_57# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR A1 a_33_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 VGND a_218_57# a_490_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_140_57# A1 a_218_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_33_409# B1 a_218_57# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_33_409# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_m.cdl b/cells/a21o/sky130_fd_sc_lp__a21o_m.cdl
index 13e37ed..e816303 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_m.cdl
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_m.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__a21o_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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=0.42 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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a21o_m
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_m.netlist.tsv b/cells/a21o/sky130_fd_sc_lp__a21o_m.netlist.tsv
index 732e4c6..9f2ec10 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_m.netlist.tsv
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_m.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__a21o_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a21o/sky130_fd_sc_lp__a21o_m.spice b/cells/a21o/sky130_fd_sc_lp__a21o_m.spice
index fb6ae77..98acf64 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_m.spice
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_m.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__a21o_m A1 A2 B1 VGND VNB VPB VPWR X
-M1000 a_324_508# A2 VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=2.289e+11p ps=2.77e+06u
-M1001 a_80_153# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.289e+11p ps=2.77e+06u
-M1002 VPWR A1 a_324_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A2 a_336_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1004 VPWR a_80_153# X VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 a_324_508# B1 a_80_153# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 a_336_47# A1 a_80_153# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_80_153# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 VGND B1 a_80_153# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR A2 a_324_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_324_508# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 X a_80_153# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_80_153# A1 a_336_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_336_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_80_153# B1 a_324_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 X a_80_153# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_0.cdl b/cells/a21oi/sky130_fd_sc_lp__a21oi_0.cdl
index a2b1a2e..3852b64 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_0.cdl
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_0.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__a21oi_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPB0 Y B1 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
+MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 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
-MMPB0 Y B1 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
-MMNA0 Y A1 VNB nshort m=1 w=0.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.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_lp__a21oi_0
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_0.netlist.tsv b/cells/a21oi/sky130_fd_sc_lp__a21oi_0.netlist.tsv
index 264b83d..6acc364 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_0.netlist.tsv
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_0.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__a21oi_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	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/a21oi/sky130_fd_sc_lp__a21oi_0.spice b/cells/a21oi/sky130_fd_sc_lp__a21oi_0.spice
index 3022827..41d5b54 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_0.spice
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_0.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__a21oi_0 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 a_136_47# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.31e+11p ps=2.78e+06u
-M1001 VGND B1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1002 a_45_473# A1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=3.488e+11p pd=3.65e+06u as=1.792e+11p ps=1.84e+06u
-M1003 Y A1 a_136_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B1 a_45_473# VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1005 VPWR A2 a_45_473# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_136_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_45_473# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 VPWR A1 a_45_473# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 a_45_473# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 VGND A2 a_136_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_1.cdl b/cells/a21oi/sky130_fd_sc_lp__a21oi_1.cdl
index 1161876..8dcfd1e 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_1.cdl
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.84 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.26 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.26 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.84 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.84 l=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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a21oi_1
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_1.netlist.tsv b/cells/a21oi/sky130_fd_sc_lp__a21oi_1.netlist.tsv
index 098e3d1..8faef63 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_1.netlist.tsv
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_1.spice b/cells/a21oi/sky130_fd_sc_lp__a21oi_1.spice
index 0729003..0a5a847 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_1.spice
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__a21oi_1 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 Y A1 a_110_69# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=2.016e+11p ps=2.16e+06u
-M1001 Y B1 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=6.867e+11p ps=6.13e+06u
-M1002 a_110_69# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.662e+11p ps=4.47e+06u
-M1003 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=4.41e+11p ps=3.22e+06u
-M1005 VPWR A2 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_27_367# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR A1 a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND A2 a_110_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_110_69# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_2.cdl b/cells/a21oi/sky130_fd_sc_lp__a21oi_2.cdl
index 771dca6..210b80e 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_2.cdl
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.84 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.26 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.26 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.84 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.84 l=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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 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
+MMNB0 Y B1 VNB nfet_01v8 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_lp__a21oi_2
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_2.netlist.tsv b/cells/a21oi/sky130_fd_sc_lp__a21oi_2.netlist.tsv
index 10f3306..1819ea1 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_2.netlist.tsv
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_2.spice b/cells/a21oi/sky130_fd_sc_lp__a21oi_2.spice
index 4fb106a..6e06016 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_2.spice
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a21oi_2 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 VPWR A1 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.56e+11p pd=6.24e+06u as=1.3734e+12p ps=1.226e+07u
-M1001 a_27_367# B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1002 Y B1 VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=7.14e+11p ps=6.74e+06u
-M1003 a_110_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1004 a_27_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y B1 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A2 a_110_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A1 a_110_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A2 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_110_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A2 a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_110_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR A1 a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND A2 a_110_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_27_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 Y B1 a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_27_367# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_27_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_110_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 Y A1 a_110_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_4.cdl b/cells/a21oi/sky130_fd_sc_lp__a21oi_4.cdl
index 5a685e3..e324eb0 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_4.cdl
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.84 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.26 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.26 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.84 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.84 l=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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.84 l=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.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_lp__a21oi_4
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_4.netlist.tsv b/cells/a21oi/sky130_fd_sc_lp__a21oi_4.netlist.tsv
index c334425..2eb996a 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_4.netlist.tsv
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_4.spice b/cells/a21oi/sky130_fd_sc_lp__a21oi_4.spice
index 507a40a..322e7d3 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_4.spice
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_lp__a21oi_4 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 a_111_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=9.408e+11p pd=8.96e+06u as=1.1844e+12p ps=1.122e+07u
-M1001 VPWR A1 a_28_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4616e+12p pd=1.24e+07u as=2.4318e+12p ps=2.15e+07u
-M1002 a_28_367# B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1003 VPWR A1 a_28_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_111_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=9.408e+11p ps=8.96e+06u
-M1005 Y A1 a_111_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_28_367# B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_111_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_28_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B1 a_28_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A2 a_111_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_111_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_28_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_111_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_28_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_28_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y B1 a_28_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A2 a_28_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A2 a_28_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y A1 a_111_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_28_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR A2 a_28_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_28_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_28_367# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VPWR A2 a_28_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR A1 a_28_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_28_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_28_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_111_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VGND A2 a_111_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 Y B1 a_28_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_28_367# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 Y B1 a_28_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 Y A1 a_111_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_111_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 a_28_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 a_111_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 Y A1 a_111_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 VGND A2 a_111_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_111_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.cdl b/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.cdl
index 840a7f0..f3854af 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.cdl
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.cdl
@@ -16,18 +16,18 @@
 
 .SUBCKT sky130_fd_sc_lp__a21oi_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPB0 Y B1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 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
-MMNB0 Y B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 Y A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI8 net43 A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net43 A2 VNB nfet_01v8 m=1 w=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 net50 B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net50 B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a21oi_lp
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.netlist.tsv b/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.netlist.tsv
index 10ccfee..1fda711 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.netlist.tsv
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.netlist.tsv
@@ -1,9 +1,9 @@
 sky130_fd_sc_lp__a21oi_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	net50	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	Y	A1	net43	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net43	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net50	B1	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	net50	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	Y	A1	net43	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net43	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net50	B1	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/a21oi/sky130_fd_sc_lp__a21oi_lp.spice b/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.spice
index 07337d7..eb6c121 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.spice
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.spice
@@ -16,18 +16,11 @@
 
 
 .subckt sky130_fd_sc_lp__a21oi_lp A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 Y B1 a_31_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=5.65e+11p ps=5.13e+06u
-M1001 a_31_409# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1002 a_132_47# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.394e+11p ps=2.82e+06u
-M1003 a_324_47# B1 Y VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.764e+11p ps=1.68e+06u
-M1004 VGND B1 a_324_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A2 a_31_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A1 a_132_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A2 a_132_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_324_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_132_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR A1 a_31_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 Y B1 a_324_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_31_409# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_31_409# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_m.cdl b/cells/a21oi/sky130_fd_sc_lp__a21oi_m.cdl
index fd3322a..cb8d234 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_m.cdl
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_m.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__a21oi_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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.42 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=0.42 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=0.42 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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.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_lp__a21oi_m
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_m.netlist.tsv b/cells/a21oi/sky130_fd_sc_lp__a21oi_m.netlist.tsv
index 2f729e0..b024122 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_m.netlist.tsv
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_m.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__a21oi_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	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/a21oi/sky130_fd_sc_lp__a21oi_m.spice b/cells/a21oi/sky130_fd_sc_lp__a21oi_m.spice
index c69d102..34962c4 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_m.spice
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_m.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__a21oi_m A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 VGND B1 Y VNB nshort w=420000u l=150000u
-+  ad=2.226e+11p pd=2.74e+06u as=1.491e+11p ps=1.55e+06u
-M1001 VPWR A2 a_27_504# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.289e+11p ps=2.77e+06u
-M1002 Y A1 a_118_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1003 Y B1 a_27_504# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1004 a_27_504# A1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_118_47# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_27_504# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_27_504# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_27_504# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_118_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND A2 a_118_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_0.cdl b/cells/a221o/sky130_fd_sc_lp__a221o_0.cdl
index 3a794c5..f340c08 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_0.cdl
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_0.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__a221o_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPB0 pndB B1 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
+MMPB1 pndB B2 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
+MMPC0 y C1 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
+MMIPX X y 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
-MMPA1 pndA A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.42 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=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=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.42 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.42 l=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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a221o_0
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_0.netlist.tsv b/cells/a221o/sky130_fd_sc_lp__a221o_0.netlist.tsv
index 1aee106..f442b3b 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_0.netlist.tsv
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_0.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__a221o_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a221o/sky130_fd_sc_lp__a221o_0.spice b/cells/a221o/sky130_fd_sc_lp__a221o_0.spice
index 01921a2..7484811 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_0.spice
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_0.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a221o_0 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 VPWR a_72_312# X VPB phighvt w=640000u l=150000u
-+  ad=3.616e+11p pd=3.69e+06u as=1.696e+11p ps=1.81e+06u
-M1001 a_216_484# A2 VPWR VPB phighvt w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=0p ps=0u
-M1002 a_216_484# B1 a_409_429# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=4.064e+11p ps=3.83e+06u
-M1003 VGND a_72_312# X VNB nshort w=420000u l=150000u
-+  ad=3.402e+11p pd=3.3e+06u as=1.113e+11p ps=1.37e+06u
-M1004 a_474_47# B1 a_72_312# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.759e+11p ps=3.47e+06u
-M1005 a_72_312# A1 a_246_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1006 VGND B2 a_474_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A1 a_216_484# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_409_429# B2 a_216_484# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_246_47# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_72_312# C1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_72_312# C1 a_409_429# VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
+X0 a_409_429# B1 a_216_484# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 X a_72_312# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_216_484# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_216_484# B2 a_409_429# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 VGND A2 a_246_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_474_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_409_429# C1 a_72_312# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 a_246_47# A1 a_72_312# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND C1 a_72_312# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 X a_72_312# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X10 a_72_312# B1 a_474_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR A2 a_216_484# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_1.cdl b/cells/a221o/sky130_fd_sc_lp__a221o_1.cdl
index 8198361..2300390 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_1.cdl
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 pndB B2 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB phighvt m=1 w=1.26 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.26 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.84 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.84 l=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.84 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a221o_1
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_1.netlist.tsv b/cells/a221o/sky130_fd_sc_lp__a221o_1.netlist.tsv
index 3372b5e..4548a13 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_1.netlist.tsv
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_1.spice b/cells/a221o/sky130_fd_sc_lp__a221o_1.spice
index c72ebaf..41b4e88 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_1.spice
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a221o_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 a_80_21# C1 a_458_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=7.119e+11p ps=6.17e+06u
-M1001 VGND a_80_21# X VNB nshort w=840000u l=150000u
-+  ad=8.988e+11p pd=5.5e+06u as=2.226e+11p ps=2.21e+06u
-M1002 VPWR A1 a_264_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.1151e+12p pd=6.81e+06u as=8.127e+11p ps=6.33e+06u
-M1003 a_80_21# C1 VGND VNB nshort w=840000u l=150000u
-+  ad=8.946e+11p pd=5.49e+06u as=0p ps=0u
-M1004 VGND B2 a_541_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=2.1e+06u
-M1005 a_264_367# B1 a_458_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_458_367# B2 a_264_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_264_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1008 a_264_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_80_21# A1 a_264_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_541_47# B1 a_80_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_80_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 VPWR A2 a_264_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_458_367# B1 a_264_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_541_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_264_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_264_367# B2 a_458_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_264_47# A1 a_80_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND A2 a_264_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_458_367# C1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VGND C1 a_80_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_80_21# B1 a_541_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_2.cdl b/cells/a221o/sky130_fd_sc_lp__a221o_2.cdl
index f8fba1f..819aa34 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_2.cdl
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 pndB B2 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB phighvt m=1 w=1.26 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.26 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.84 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.84 l=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.84 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 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_lp__a221o_2
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_2.netlist.tsv b/cells/a221o/sky130_fd_sc_lp__a221o_2.netlist.tsv
index f76a287..f755e6a 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_2.netlist.tsv
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_2.spice b/cells/a221o/sky130_fd_sc_lp__a221o_2.spice
index 9b6ff29..b5f9644 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_2.spice
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__a221o_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 a_334_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=8.001e+11p pd=6.31e+06u as=1.3104e+12p ps=9.64e+06u
-M1001 VGND B2 a_739_49# VNB nshort w=840000u l=150000u
-+  ad=1.1886e+12p pd=9.55e+06u as=2.688e+11p ps=2.32e+06u
-M1002 a_653_367# B2 a_334_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.867e+11p pd=6.13e+06u as=0p ps=0u
-M1003 a_86_27# A1 a_356_53# VNB nshort w=840000u l=150000u
-+  ad=4.578e+11p pd=4.45e+06u as=1.764e+11p ps=2.1e+06u
-M1004 X a_86_27# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1005 a_334_367# B1 a_653_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_739_49# B1 a_86_27# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A1 a_334_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_356_53# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_86_27# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_653_367# C1 a_86_27# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1011 VGND a_86_27# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1012 X a_86_27# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_86_27# C1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_334_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_334_367# B2 a_653_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_86_27# B1 a_739_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_653_367# B1 a_334_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_86_27# C1 a_653_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND a_86_27# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_739_49# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 X a_86_27# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VPWR a_86_27# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VGND A2 a_356_53# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VGND C1 a_86_27# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 X a_86_27# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_356_53# A1 a_86_27# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VPWR A2 a_334_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_4.cdl b/cells/a221o/sky130_fd_sc_lp__a221o_4.cdl
index 45a80aa..6906888 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_4.cdl
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 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
-MMPB0 pndB B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 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
+MMNB0 y B1 VNB nfet_01v8 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
-MMPB1 pndB B2 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 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
+MMNC0 y C1 VNB nfet_01v8 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 y C1 VPB phighvt m=2 w=1.26 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.26 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.84 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.84 l=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.84 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=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_lp__a221o_4
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_4.netlist.tsv b/cells/a221o/sky130_fd_sc_lp__a221o_4.netlist.tsv
index 4378e83..96a4b61 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_4.netlist.tsv
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_4.spice b/cells/a221o/sky130_fd_sc_lp__a221o_4.spice
index 2cc76f5..5f3fde8 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_4.spice
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_lp__a221o_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 a_457_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=1.386e+12p ps=1.338e+07u
-M1001 VGND C1 a_83_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=9.156e+11p ps=8.9e+06u
-M1002 a_457_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=1.7262e+12p ps=1.534e+07u
-M1003 X a_83_21# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1004 a_457_367# B1 a_822_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.3734e+12p ps=1.226e+07u
-M1005 a_83_21# B1 a_1077_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=6.804e+11p ps=6.66e+06u
-M1006 VGND B2 a_1077_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_83_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1008 VPWR a_83_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A2 a_457_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_457_367# B2 a_822_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_83_21# C1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_83_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_457_47# A1 a_83_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_83_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A1 a_457_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_822_367# C1 a_83_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1017 VPWR A2 a_457_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_83_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_822_367# B1 a_457_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_83_21# A1 a_457_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_83_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1077_47# B2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_83_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1077_47# B1 a_83_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_457_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_83_21# C1 a_822_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_822_367# B2 a_457_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_83_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_1077_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_457_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND A2 a_457_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND a_83_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_457_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VGND B2 a_1077_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 X a_83_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_822_367# B1 a_457_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR a_83_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_822_367# C1 a_83_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_83_21# B1 a_1077_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_1077_47# B1 a_83_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VPWR A1 a_457_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_457_47# A1 a_83_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VPWR a_83_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_83_21# C1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 VGND C1 a_83_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_822_367# B2 a_457_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_457_367# B1 a_822_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 a_83_21# C1 a_822_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 a_457_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 X a_83_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 VPWR A2 a_457_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 a_83_21# A1 a_457_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 X a_83_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 a_457_367# B2 a_822_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 VGND a_83_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_lp.cdl b/cells/a221o/sky130_fd_sc_lp__a221o_lp.cdl
index 1174156..fdf362c 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_lp.cdl
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_lp.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__a221o_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPB0 pndB B1 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
+MMPB1 pndB B2 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
+MMPC0 y C1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIPX X y 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
-MMPB0 pndB B1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 net75 A2 VNB nfet_01v8 m=1 w=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 net87 C1 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 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 l=0.25 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA1 net75 A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI11 net84 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net87 C1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI12 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 net84 B2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net72 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=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 y A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net72 y VNB nshort m=1 w=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 y B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI10 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a221o_lp
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_lp.netlist.tsv b/cells/a221o/sky130_fd_sc_lp__a221o_lp.netlist.tsv
index 2cada2e..8c6886e 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_lp.netlist.tsv
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_lp.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__a221o_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	net75	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net87	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	net87	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net84	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	net72	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	y	A1	net75	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net72	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	y	B1	net84	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	net75	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net87	C1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	net87	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net84	B2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	net72	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	y	A1	net75	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net72	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	y	B1	net84	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_lp.spice b/cells/a221o/sky130_fd_sc_lp__a221o_lp.spice
index 9febed5..3a315e4 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_lp.spice
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_lp.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__a221o_lp A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 a_582_66# B1 a_96_183# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=4.095e+11p ps=3.63e+06u
-M1001 VGND B2 a_582_66# VNB nshort w=420000u l=150000u
-+  ad=3.066e+11p pd=3.14e+06u as=0p ps=0u
-M1002 a_96_183# C1 a_545_400# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=5.65e+11p ps=5.13e+06u
-M1003 VPWR a_96_183# X VPB phighvt w=1e+06u l=250000u
-+  ad=8.35e+11p pd=5.67e+06u as=2.85e+11p ps=2.57e+06u
-M1004 a_336_66# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1005 a_322_419# A2 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1006 a_545_400# B2 a_322_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_764_66# C1 VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1008 a_96_183# C1 a_764_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_322_419# B1 a_545_400# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_162_66# a_96_183# X VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1011 a_96_183# A1 a_336_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A1 a_322_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_96_183# a_162_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_322_419# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 VGND C1 a_764_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_545_400# B1 a_322_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_162_66# a_96_183# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND A2 a_336_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_545_400# C1 a_96_183# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_336_66# A1 a_96_183# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR A2 a_322_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_322_419# B2 a_545_400# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_582_66# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 X a_96_183# a_162_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 X a_96_183# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 a_764_66# C1 a_96_183# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_96_183# B1 a_582_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_m.cdl b/cells/a221o/sky130_fd_sc_lp__a221o_m.cdl
index c65031c..06d2b34 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_m.cdl
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_m.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__a221o_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.42 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=0.42 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=0.42 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.42 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.42 l=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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a221o_m
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_m.netlist.tsv b/cells/a221o/sky130_fd_sc_lp__a221o_m.netlist.tsv
index 4c0f8d3..e05efef 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_m.netlist.tsv
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_m.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__a221o_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a221o/sky130_fd_sc_lp__a221o_m.spice b/cells/a221o/sky130_fd_sc_lp__a221o_m.spice
index f73d4a2..28b0f8a 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_m.spice
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_m.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a221o_m A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 VPWR A1 a_233_535# VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=2.352e+11p ps=2.8e+06u
-M1001 a_337_397# B2 a_233_535# VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=0p ps=0u
-M1002 VPWR a_33_153# X VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1003 VGND B2 a_399_47# VNB nshort w=420000u l=150000u
-+  ad=3.003e+11p pd=3.11e+06u as=8.82e+10p ps=1.26e+06u
-M1004 VGND a_33_153# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 a_399_47# B1 a_33_153# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.234e+11p ps=3.22e+06u
-M1006 a_233_535# B1 a_337_397# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_196_47# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1008 a_33_153# A1 a_196_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_33_153# C1 a_337_397# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1010 a_233_535# A2 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_33_153# C1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND C1 a_33_153# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_33_153# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 X a_33_153# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_33_153# B1 a_399_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR A2 a_233_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_196_47# A1 a_33_153# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_233_535# B2 a_337_397# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_399_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_337_397# B1 a_233_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VGND A2 a_196_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_233_535# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_337_397# C1 a_33_153# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_0.cdl b/cells/a221oi/sky130_fd_sc_lp__a221oi_0.cdl
index 016c4a5..c17c4e1 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_0.cdl
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a221oi_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPB0 pndB B1 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
+MMPB1 pndB B2 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
+MMPC0 Y C1 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
+MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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=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=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=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.42 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.42 l=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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=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_lp__a221oi_0
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_0.netlist.tsv b/cells/a221oi/sky130_fd_sc_lp__a221oi_0.netlist.tsv
index 241ffb0..25ce9cc 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_0.netlist.tsv
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a221oi_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	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/a221oi/sky130_fd_sc_lp__a221oi_0.spice b/cells/a221oi/sky130_fd_sc_lp__a221oi_0.spice
index c274ebb..ddb7d57 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_0.spice
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a221oi_0 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 a_228_47# B2 VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.856e+11p ps=3.04e+06u
-M1001 Y B1 a_228_47# VNB nshort w=420000u l=150000u
-+  ad=2.625e+11p pd=2.93e+06u as=0p ps=0u
-M1002 a_242_487# B2 a_156_487# VPB phighvt w=640000u l=150000u
-+  ad=4.864e+11p pd=4.08e+06u as=3.936e+11p ps=3.79e+06u
-M1003 VPWR A1 a_242_487# VPB phighvt w=640000u l=150000u
-+  ad=2.24e+11p pd=1.98e+06u as=0p ps=0u
-M1004 a_242_487# A2 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A2 a_408_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1006 a_408_47# A1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_156_487# C1 Y VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1008 a_156_487# B1 a_242_487# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND C1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_408_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_242_487# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 VPWR A2 a_242_487# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_228_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 Y A1 a_408_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_242_487# B1 a_156_487# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 VGND B2 a_228_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 Y C1 a_156_487# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_156_487# B2 a_242_487# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_1.cdl b/cells/a221oi/sky130_fd_sc_lp__a221oi_1.cdl
index be60288..91cbdcb 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_1.cdl
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=1.26 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.26 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.26 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.84 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.84 l=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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a221oi_1
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_1.netlist.tsv b/cells/a221oi/sky130_fd_sc_lp__a221oi_1.netlist.tsv
index 2d3c0e2..898f2e1 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_1.netlist.tsv
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_1.spice b/cells/a221oi/sky130_fd_sc_lp__a221oi_1.spice
index 73532c2..5139840 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_1.spice
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a221oi_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 VPWR A1 a_217_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.536e+11p pd=3.24e+06u as=1.0836e+12p ps=9.28e+06u
-M1001 a_300_47# B2 VGND VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=7.56e+11p ps=5.16e+06u
-M1002 a_217_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y B1 a_300_47# VNB nshort w=840000u l=150000u
-+  ad=5.502e+11p pd=4.67e+06u as=0p ps=0u
-M1004 a_110_367# B2 a_217_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.119e+11p pd=6.17e+06u as=0p ps=0u
-M1005 a_480_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=0p ps=0u
-M1006 a_217_367# B1 a_110_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND C1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_480_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_110_367# C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 VGND B2 a_300_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_217_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_480_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 Y C1 a_110_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_110_367# B1 a_217_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VPWR A2 a_217_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_300_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 Y A1 a_480_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_217_367# B2 a_110_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_2.cdl b/cells/a221oi/sky130_fd_sc_lp__a221oi_2.cdl
index 75d2cb5..5c8b8a3 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_2.cdl
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 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
+MMNB0 Y B1 VNB nfet_01v8 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
-MMPB0 pndB B1 VPB phighvt m=2 w=1.26 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.26 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.26 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.84 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.84 l=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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 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
+MMNC0 Y C1 VNB nfet_01v8 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_lp__a221oi_2
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_2.netlist.tsv b/cells/a221oi/sky130_fd_sc_lp__a221oi_2.netlist.tsv
index e08482b..52bff74 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_2.netlist.tsv
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_2.spice b/cells/a221oi/sky130_fd_sc_lp__a221oi_2.spice
index 1ac65d1..8564230 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_2.spice
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__a221oi_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 a_27_367# B1 a_303_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.3734e+12p pd=1.226e+07u as=1.7766e+12p ps=1.542e+07u
-M1001 Y A1 a_760_47# VNB nshort w=840000u l=150000u
-+  ad=7.056e+11p pd=6.72e+06u as=4.704e+11p ps=4.48e+06u
-M1002 a_384_47# B1 Y VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1003 Y C1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=1.386e+12p ps=1.002e+07u
-M1004 a_384_47# B2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_367# C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1006 a_303_367# B1 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND C1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_760_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A1 a_303_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=8.442e+11p pd=6.38e+06u as=0p ps=0u
-M1010 VGND B2 a_384_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_760_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A2 a_303_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y B1 a_384_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_303_367# B2 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A2 a_760_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_303_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_367# B2 a_303_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y C1 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_303_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_384_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_303_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_303_367# B1 a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_27_367# B1 a_303_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND A2 a_760_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Y C1 a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_303_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 Y B1 a_384_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_760_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_384_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_27_367# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_27_367# B2 a_303_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_760_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 Y A1 a_760_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VPWR A2 a_303_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_303_367# B2 a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VPWR A1 a_303_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VGND B2 a_384_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_4.cdl b/cells/a221oi/sky130_fd_sc_lp__a221oi_4.cdl
index ac5b5c1..c19f445 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_4.cdl
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.84 l=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.84 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.26 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.26 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.26 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.84 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.84 l=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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=4 w=0.84 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.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_lp__a221oi_4
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_4.netlist.tsv b/cells/a221oi/sky130_fd_sc_lp__a221oi_4.netlist.tsv
index a134a45..4015293 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_4.netlist.tsv
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_4.spice b/cells/a221oi/sky130_fd_sc_lp__a221oi_4.spice
index fa52e1c..00299f5 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_4.spice
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__a221oi_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 a_1334_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=9.408e+11p pd=8.96e+06u as=1.4112e+12p ps=1.344e+07u
-M1001 a_546_47# B2 VGND VNB nshort w=840000u l=150000u
-+  ad=1.2936e+12p pd=9.8e+06u as=1.6884e+12p ps=1.578e+07u
-M1002 VGND B2 a_546_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_533_367# B1 a_85_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.2886e+12p pd=2.79e+07u as=2.4318e+12p ps=2.15e+07u
-M1004 a_533_367# B2 a_85_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_533_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.449e+12p ps=1.238e+07u
-M1006 a_546_47# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND C1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_85_367# B2 a_533_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_533_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A1 a_533_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_533_367# B1 a_85_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B1 a_546_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A2 a_1334_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A2 a_533_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A2 a_1334_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y C1 a_85_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1017 Y A1 a_1334_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1334_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A2 a_533_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A1 a_1334_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_546_47# B2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y C1 a_85_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_85_367# B2 a_533_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_533_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y C1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y B1 a_546_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_546_47# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y C1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1334_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_85_367# B1 a_533_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_85_367# C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_533_367# B2 a_85_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_533_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND B2 a_546_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_85_367# B1 a_533_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND C1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_85_367# C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR A1 a_533_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_1334_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_85_367# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 Y C1 a_85_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_1334_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_546_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_85_367# B1 a_533_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_85_367# B1 a_533_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR A2 a_533_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 Y B1 a_546_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VGND A2 a_1334_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VGND B2 a_546_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 Y C1 a_85_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 Y A1 a_1334_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_1334_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_533_367# B1 a_85_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 VPWR A2 a_533_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VGND A2 a_1334_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 a_533_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 a_533_367# B1 a_85_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 VGND B2 a_546_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 a_546_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 Y B1 a_546_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 a_85_367# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 a_1334_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 a_533_367# B2 a_85_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 a_533_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 VPWR A1 a_533_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 a_1334_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X30 a_546_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X31 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X32 a_85_367# B2 a_533_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X33 a_533_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X34 a_533_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X35 a_546_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X36 a_533_367# B2 a_85_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X37 VPWR A1 a_533_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X38 a_85_367# B2 a_533_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X39 Y A1 a_1334_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.cdl b/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.cdl
index 1087dd8..a053aa8 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.cdl
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.cdl
@@ -16,26 +16,26 @@
 
 .SUBCKT sky130_fd_sc_lp__a221oi_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPB0 pndB B1 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
+MMPB1 pndB B2 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
+MMPC0 Y C1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 net82 A2 VNB nfet_01v8 m=1 w=0.42 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.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MI12 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 pndB B2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI10 net70 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 Y C1 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
-MMNA1 net82 A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net77 C1 VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 Y A1 VNB nshort m=1 w=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 net70 B2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net77 C1 VNB nshort m=1 w=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 Y B1 VNB nshort m=1 w=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_lp__a221oi_lp
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.netlist.tsv b/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.netlist.tsv
index 463be25..fc00780 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.netlist.tsv
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.netlist.tsv
@@ -1,13 +1,13 @@
 sky130_fd_sc_lp__a221oi_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	net82	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	net77	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Y	A1	net82	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net70	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net77	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Y	B1	net70	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	net82	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	net77	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Y	A1	net82	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net70	B2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net77	C1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Y	B1	net70	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.spice b/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.spice
index a53e92c..0d307be 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.spice
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.spice
@@ -16,26 +16,15 @@
 
 
 .subckt sky130_fd_sc_lp__a221oi_lp A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 VGND A2 a_341_48# VNB nshort w=420000u l=150000u
-+  ad=4.137e+11p pd=3.65e+06u as=1.008e+11p ps=1.32e+06u
-M1001 a_341_48# A1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.835e+11p ps=3.03e+06u
-M1002 a_163_412# A2 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=5.6e+11p pd=5.12e+06u as=5.7e+11p ps=3.14e+06u
-M1003 Y C1 a_589_48# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1004 Y C1 a_56_412# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=5.65e+11p ps=5.13e+06u
-M1005 VPWR A1 a_163_412# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_589_48# C1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_56_412# B1 a_163_412# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_155_48# B2 VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1009 Y B1 a_155_48# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_163_412# B2 a_56_412# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_56_412# B2 a_163_412# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_155_48# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 Y A1 a_341_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_56_412# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 VGND C1 a_589_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND B2 a_155_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_163_412# B1 a_56_412# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_341_48# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_163_412# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_589_48# C1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VPWR A2 a_163_412# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_m.cdl b/cells/a221oi/sky130_fd_sc_lp__a221oi_m.cdl
index c803048..fa86b79 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_m.cdl
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a221oi_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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=0.42 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=0.42 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=0.42 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.42 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.42 l=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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=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_lp__a221oi_m
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_m.netlist.tsv b/cells/a221oi/sky130_fd_sc_lp__a221oi_m.netlist.tsv
index 2452b23..23d3e41 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_m.netlist.tsv
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a221oi_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	pndB	B2	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	pndB	B2	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	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/a221oi/sky130_fd_sc_lp__a221oi_m.spice b/cells/a221oi/sky130_fd_sc_lp__a221oi_m.spice
index 9b1c626..09ba5dc 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_m.spice
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a221oi_m A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 VPWR A1 a_296_535# VPB phighvt w=420000u l=150000u
-+  ad=1.974e+11p pd=1.78e+06u as=2.352e+11p ps=2.8e+06u
-M1001 a_226_55# B2 VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.289e+11p ps=2.77e+06u
-M1002 Y B1 a_226_55# VNB nshort w=420000u l=150000u
-+  ad=2.751e+11p pd=2.99e+06u as=0p ps=0u
-M1003 a_210_535# B1 a_296_535# VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=0p ps=0u
-M1004 a_406_55# A1 Y VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1005 a_296_535# B2 a_210_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A2 a_406_55# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_210_535# C1 Y VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1008 a_296_535# A2 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND C1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B2 a_226_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_210_535# B2 a_296_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 Y C1 a_210_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_406_55# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR A2 a_296_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_296_535# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_226_55# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_296_535# B1 a_210_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 Y A1 a_406_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_0.cdl b/cells/a22o/sky130_fd_sc_lp__a22o_0.cdl
index 2f4baac..ee3129a 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_0.cdl
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a22o_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPB0 y B1 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
+MMPB1 y B2 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
+MMIPX X y 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
-MMPA1 pndA A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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=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=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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a22o_0
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_0.netlist.tsv b/cells/a22o/sky130_fd_sc_lp__a22o_0.netlist.tsv
index e10ccc7..ff26c76 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_0.netlist.tsv
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a22o_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	y	B2	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a22o/sky130_fd_sc_lp__a22o_0.spice b/cells/a22o/sky130_fd_sc_lp__a22o_0.spice
index 3bff74c..fa92dab 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_0.spice
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a22o_0 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 a_85_155# B1 a_257_491# VPB phighvt w=640000u l=150000u
-+  ad=2.496e+11p pd=2.06e+06u as=4.48e+11p ps=3.96e+06u
-M1001 a_415_47# B1 a_85_155# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.638e+11p ps=1.62e+06u
-M1002 VPWR A1 a_257_491# VPB phighvt w=640000u l=150000u
-+  ad=4.256e+11p pd=3.89e+06u as=0p ps=0u
-M1003 a_235_47# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.688e+11p ps=2.96e+06u
-M1004 VGND B2 a_415_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_85_155# X VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1006 a_257_491# B2 a_85_155# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_257_491# A2 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_85_155# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.281e+11p ps=1.45e+06u
-M1009 a_85_155# A1 a_235_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_235_47# A1 a_85_155# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_257_491# B1 a_85_155# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_85_155# B1 a_415_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_257_491# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 X a_85_155# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_415_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 X a_85_155# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 VPWR A2 a_257_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 VGND A2 a_235_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_85_155# B2 a_257_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_1.cdl b/cells/a22o/sky130_fd_sc_lp__a22o_1.cdl
index 66cf7ff..87f2ed5 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_1.cdl
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 y B2 VPB phighvt m=1 w=1.26 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.26 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.84 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.84 l=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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a22o_1
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_1.netlist.tsv b/cells/a22o/sky130_fd_sc_lp__a22o_1.netlist.tsv
index 8f4cb0f..44b2f37 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_1.netlist.tsv
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_1.spice b/cells/a22o/sky130_fd_sc_lp__a22o_1.spice
index 080c30f..1017339 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_1.spice
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a22o_1 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 a_217_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0458e+12p pd=9.22e+06u as=8.253e+11p ps=6.35e+06u
-M1001 VGND A2 a_480_56# VNB nshort w=840000u l=150000u
-+  ad=8.022e+11p pd=5.27e+06u as=3.276e+11p ps=2.46e+06u
-M1002 a_80_246# B2 a_217_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.78e+11p pd=3.12e+06u as=0p ps=0u
-M1003 a_294_56# B2 VGND VNB nshort w=840000u l=150000u
-+  ad=2.016e+11p pd=2.16e+06u as=0p ps=0u
-M1004 a_80_246# B1 a_294_56# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=0p ps=0u
-M1005 a_217_367# B1 a_80_246# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_80_246# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1007 a_480_56# A1 a_80_246# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A1 a_217_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_80_246# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 a_80_246# A1 a_480_56# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND B2 a_294_56# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 X a_80_246# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_80_246# B1 a_217_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_480_56# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPWR A2 a_217_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 X a_80_246# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_217_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_217_367# B2 a_80_246# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_294_56# B1 a_80_246# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_2.cdl b/cells/a22o/sky130_fd_sc_lp__a22o_2.cdl
index bc28de4..0a40702 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_2.cdl
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 y B2 VPB phighvt m=1 w=1.26 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.26 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.84 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.84 l=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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 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_lp__a22o_2
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_2.netlist.tsv b/cells/a22o/sky130_fd_sc_lp__a22o_2.netlist.tsv
index fa503a1..9168c82 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_2.netlist.tsv
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_2.spice b/cells/a22o/sky130_fd_sc_lp__a22o_2.spice
index da314f7..657faf1 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_2.spice
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a22o_2 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 a_94_249# A1 a_340_49# VNB nshort w=840000u l=150000u
-+  ad=4.452e+11p pd=4.42e+06u as=1.764e+11p ps=2.1e+06u
-M1001 X a_94_249# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=9.114e+11p ps=7.21e+06u
-M1002 VGND a_94_249# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A1 a_326_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.2096e+12p pd=9.48e+06u as=7.056e+11p ps=6.16e+06u
-M1004 a_94_249# B1 a_326_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.678e+11p pd=6.1e+06u as=0p ps=0u
-M1005 a_340_49# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_610_49# B2 VGND VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1007 a_94_249# B1 a_610_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_94_249# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1009 a_326_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_326_367# B2 a_94_249# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_94_249# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_326_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND a_94_249# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR a_94_249# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 X a_94_249# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 X a_94_249# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_610_49# B1 a_94_249# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_326_367# B1 a_94_249# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_94_249# B2 a_326_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR A2 a_326_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VGND A2 a_340_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VGND B2 a_610_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_340_49# A1 a_94_249# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_4.cdl b/cells/a22o/sky130_fd_sc_lp__a22o_4.cdl
index 44f91b5..cf8f175 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_4.cdl
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 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
-MMPB0 y B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 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
+MMNB0 y B1 VNB nfet_01v8 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
-MMPB1 y B2 VPB phighvt m=2 w=1.26 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.26 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.84 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.84 l=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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 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
+MMINX X y VNB nfet_01v8 m=4 w=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_lp__a22o_4
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_4.netlist.tsv b/cells/a22o/sky130_fd_sc_lp__a22o_4.netlist.tsv
index 0ac2ecd..4bd164c 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_4.netlist.tsv
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_4.spice b/cells/a22o/sky130_fd_sc_lp__a22o_4.spice
index 3c1aca9..c4ccc22 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_4.spice
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_lp__a22o_4 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 X a_103_263# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=1.827e+12p ps=1.55e+07u
-M1001 a_103_263# B1 a_632_47# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=4.704e+11p ps=4.48e+06u
-M1002 VPWR A1 a_549_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.8144e+12p ps=1.548e+07u
-M1003 VGND a_103_263# X VNB nshort w=840000u l=150000u
-+  ad=1.3398e+12p pd=1.159e+07u as=4.704e+11p ps=4.48e+06u
-M1004 a_549_367# B1 a_103_263# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1005 a_549_367# B2 a_103_263# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_632_47# B1 a_103_263# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_1006_47# A1 a_103_263# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1008 VPWR a_103_263# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_549_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_103_263# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_103_263# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A2 a_549_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1006_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_103_263# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B2 a_632_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A2 a_1006_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_549_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_103_263# A1 a_1006_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_103_263# B1 a_549_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_632_47# B2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_103_263# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_103_263# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_103_263# B2 a_549_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_103_263# B1 a_549_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR A2 a_549_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 X a_103_263# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VGND A2 a_1006_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND a_103_263# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 X a_103_263# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_632_47# B1 a_103_263# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_549_367# B1 a_103_263# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_103_263# B1 a_632_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 X a_103_263# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR a_103_263# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_632_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VGND B2 a_632_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VPWR a_103_263# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_549_367# B2 a_103_263# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_103_263# B2 a_549_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_1006_47# A1 a_103_263# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_549_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 a_549_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VGND a_103_263# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 VPWR A1 a_549_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 X a_103_263# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 a_103_263# A1 a_1006_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_1006_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_lp.cdl b/cells/a22o/sky130_fd_sc_lp__a22o_lp.cdl
index 2b07e3d..6c69431 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_lp.cdl
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_lp.cdl
@@ -16,26 +16,26 @@
 
 .SUBCKT sky130_fd_sc_lp__a22o_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPB0 y B1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPB1 y B2 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
-MMPB0 y B1 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
-MMPB1 y B2 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
-MMIPX X y 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
-MMNA0 y A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIPX X y 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
-MMNB0 y B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 net67 B2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net63 A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 net67 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net63 A2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net58 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net58 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a22o_lp
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_lp.netlist.tsv b/cells/a22o/sky130_fd_sc_lp__a22o_lp.netlist.tsv
index 21ad7c9..328204b 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_lp.netlist.tsv
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_lp.netlist.tsv
@@ -1,13 +1,13 @@
 sky130_fd_sc_lp__a22o_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	net63	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	net67	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	net67	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net63	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	net58	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net58	y	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	y	B2	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	net63	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	net67	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	net67	B2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net63	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	net58	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net58	y	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/a22o/sky130_fd_sc_lp__a22o_lp.spice b/cells/a22o/sky130_fd_sc_lp__a22o_lp.spice
index 8da6ac4..308934b 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_lp.spice
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_lp.spice
@@ -16,26 +16,15 @@
 
 
 .subckt sky130_fd_sc_lp__a22o_lp A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 a_137_409# B1 a_243_409# VPB phighvt w=1e+06u l=250000u
-+  ad=5.6e+11p pd=5.12e+06u as=5.85e+11p ps=3.17e+06u
-M1001 VGND A2 a_389_47# VNB nshort w=420000u l=150000u
-+  ad=2.73e+11p pd=2.98e+06u as=1.764e+11p ps=1.68e+06u
-M1002 a_606_47# a_243_409# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1003 X a_243_409# a_606_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1004 a_243_409# B1 a_225_47# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.008e+11p ps=1.32e+06u
-M1005 a_225_47# B2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_243_409# B2 a_137_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A2 a_137_409# VPB phighvt w=1e+06u l=250000u
-+  ad=7.95e+11p pd=5.59e+06u as=0p ps=0u
-M1008 a_389_47# A1 a_243_409# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_137_409# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_243_409# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
+X0 a_137_409# B2 a_243_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_243_409# B1 a_137_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_225_47# B1 a_243_409# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND a_243_409# a_606_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR a_243_409# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_243_409# A1 a_389_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR A1 a_137_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_389_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND B2 a_225_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_137_409# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 a_606_47# a_243_409# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_m.cdl b/cells/a22o/sky130_fd_sc_lp__a22o_m.cdl
index 1b9abb2..fcae6c2 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_m.cdl
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a22o_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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=0.42 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=0.42 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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a22o_m
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_m.netlist.tsv b/cells/a22o/sky130_fd_sc_lp__a22o_m.netlist.tsv
index c309096..d3e88ab 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_m.netlist.tsv
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a22o_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	y	B2	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a22o/sky130_fd_sc_lp__a22o_m.spice b/cells/a22o/sky130_fd_sc_lp__a22o_m.spice
index d709ffb..b2b3810 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_m.spice
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a22o_m A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 a_85_317# B1 a_265_501# VPB phighvt w=420000u l=150000u
-+  ad=2.258e+11p pd=1.94e+06u as=2.352e+11p ps=2.8e+06u
-M1001 VGND a_85_317# X VNB nshort w=420000u l=150000u
-+  ad=3.402e+11p pd=3.3e+06u as=1.197e+11p ps=1.41e+06u
-M1002 VPWR a_85_317# X VPB phighvt w=420000u l=150000u
-+  ad=3.045e+11p pd=3.13e+06u as=1.113e+11p ps=1.37e+06u
-M1003 VPWR A1 a_265_501# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_85_317# A1 a_265_125# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=8.82e+10p ps=1.26e+06u
-M1005 a_265_501# A2 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_265_501# B2 a_85_317# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_265_125# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND B2 a_445_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1009 a_445_125# B1 a_85_317# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_85_317# B2 a_265_501# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VGND A2 a_265_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_85_317# B1 a_445_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_445_125# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR A2 a_265_501# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 X a_85_317# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_265_501# B1 a_85_317# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_265_125# A1 a_85_317# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 X a_85_317# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_265_501# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_0.cdl b/cells/a22oi/sky130_fd_sc_lp__a22oi_0.cdl
index 8831147..5baf780 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_0.cdl
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_0.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__a22oi_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPB0 Y B1 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
+MMPB1 Y B2 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
+MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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=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=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.42 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.42 l=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.42 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.42 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.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_lp__a22oi_0
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_0.netlist.tsv b/cells/a22oi/sky130_fd_sc_lp__a22oi_0.netlist.tsv
index e37d704..90e9f36 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_0.netlist.tsv
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_0.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__a22oi_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	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/a22oi/sky130_fd_sc_lp__a22oi_0.spice b/cells/a22oi/sky130_fd_sc_lp__a22oi_0.spice
index 2baf390..ac4b1df 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_0.spice
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_0.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__a22oi_0 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_45_405# A2 VPWR VPB phighvt w=640000u l=150000u
-+  ad=5.408e+11p pd=5.53e+06u as=1.792e+11p ps=1.84e+06u
-M1001 VGND A2 a_307_47# VNB nshort w=420000u l=150000u
-+  ad=2.457e+11p pd=2.85e+06u as=8.82e+10p ps=1.26e+06u
-M1002 VPWR A1 a_45_405# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y B1 a_121_47# VNB nshort w=420000u l=150000u
-+  ad=1.764e+11p pd=1.68e+06u as=8.82e+10p ps=1.26e+06u
-M1004 Y B2 a_45_405# VPB phighvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1005 a_45_405# B1 Y VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_121_47# B2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_307_47# A1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A1 a_307_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR A2 a_45_405# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_45_405# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_307_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_121_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND B2 a_121_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_45_405# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 Y B1 a_45_405# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_1.cdl b/cells/a22oi/sky130_fd_sc_lp__a22oi_1.cdl
index 1f7861e..858352e 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_1.cdl
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 VPB phighvt m=1 w=1.26 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.26 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.84 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.84 l=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.84 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.84 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.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_lp__a22oi_1
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_1.netlist.tsv b/cells/a22oi/sky130_fd_sc_lp__a22oi_1.netlist.tsv
index 9e2dee5..dbd2d54 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_1.netlist.tsv
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_1.spice b/cells/a22oi/sky130_fd_sc_lp__a22oi_1.spice
index 18c4419..4f389b8 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_1.spice
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__a22oi_1 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_65_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0899e+12p pd=9.29e+06u as=7.812e+11p ps=3.76e+06u
-M1001 VGND A2 a_331_69# VNB nshort w=840000u l=150000u
-+  ad=4.452e+11p pd=4.42e+06u as=3.276e+11p ps=2.46e+06u
-M1002 Y B2 a_65_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1003 VPWR A1 a_65_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_148_69# B2 VGND VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1005 a_331_69# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=3.402e+11p ps=2.49e+06u
-M1006 a_65_367# B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B1 a_148_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A2 a_65_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 Y A1 a_331_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_65_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_148_69# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_331_69# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND B2 a_148_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Y B1 a_65_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_65_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_2.cdl b/cells/a22oi/sky130_fd_sc_lp__a22oi_2.cdl
index 3e66eec..e0c2e26 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_2.cdl
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 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
+MMNB0 Y B1 VNB nfet_01v8 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
-MMPB0 Y B1 VPB phighvt m=2 w=1.26 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.26 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.84 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.84 l=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.84 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.84 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.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_lp__a22oi_2
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_2.netlist.tsv b/cells/a22oi/sky130_fd_sc_lp__a22oi_2.netlist.tsv
index d22cfd0..5417a3b 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_2.netlist.tsv
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_2.spice b/cells/a22oi/sky130_fd_sc_lp__a22oi_2.spice
index 2987a18..74666cb 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_2.spice
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__a22oi_2 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_49_367# B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7262e+12p pd=1.534e+07u as=7.56e+11p ps=6.24e+06u
-M1001 a_49_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.57105e+12p ps=7.68e+06u
-M1002 Y A1 a_179_47# VNB nshort w=840000u l=150000u
-+  ad=8.484e+11p pd=7.06e+06u as=4.704e+11p ps=4.48e+06u
-M1003 a_179_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_49_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y B2 a_49_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_595_47# B2 VGND VNB nshort w=840000u l=150000u
-+  ad=5.628e+11p pd=4.7e+06u as=6.048e+11p ps=4.8e+06u
-M1007 VGND A2 a_179_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_595_47# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_179_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_49_367# B2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B1 a_595_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND B2 a_595_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A2 a_49_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A1 a_49_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y B1 a_49_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_49_367# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR A1 a_49_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VGND B2 a_595_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 Y B1 a_49_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_595_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND A2 a_179_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Y A1 a_179_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_179_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_49_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_179_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 Y B1 a_595_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VPWR A2 a_49_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_49_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_595_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 Y B2 a_49_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_49_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_4.cdl b/cells/a22oi/sky130_fd_sc_lp__a22oi_4.cdl
index dacf09a..7ddc142 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_4.cdl
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.84 l=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.84 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.26 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.26 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.84 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.84 l=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.84 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.84 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.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_lp__a22oi_4
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_4.netlist.tsv b/cells/a22oi/sky130_fd_sc_lp__a22oi_4.netlist.tsv
index d9181f5..09f552f 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_4.netlist.tsv
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_4.spice b/cells/a22oi/sky130_fd_sc_lp__a22oi_4.spice
index db75066..2d629cd 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_4.spice
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_lp__a22oi_4 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 Y B1 a_89_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=3.3705e+12p ps=2.803e+07u
-M1001 a_63_65# B1 Y VNB nshort w=840000u l=150000u
-+  ad=1.2012e+12p pd=1.126e+07u as=9.408e+11p ps=8.96e+06u
-M1002 VGND A2 a_867_47# VNB nshort w=840000u l=150000u
-+  ad=9.408e+11p pd=8.96e+06u as=1.1508e+12p ps=1.114e+07u
-M1003 VPWR A2 a_89_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4679e+12p pd=1.241e+07u as=0p ps=0u
-M1004 a_867_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A1 a_867_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B2 a_89_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A2 a_89_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_89_367# B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_63_65# B2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B2 a_63_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_63_65# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_867_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_89_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_867_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_89_367# B2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_89_367# B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_89_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_63_65# B2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y B1 a_89_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y B1 a_63_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y A1 a_867_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_867_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_89_367# B2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y B1 a_63_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_89_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR A1 a_89_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y B2 a_89_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND B2 a_63_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_89_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A1 a_89_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A2 a_867_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_89_367# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_89_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR A2 a_89_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_63_65# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_867_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND B2 a_63_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR A1 a_89_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 Y B1 a_89_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_63_65# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VGND B2 a_63_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_63_65# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 Y A1 a_867_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_867_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_89_367# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VGND A2 a_867_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_89_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 Y B2 a_89_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 Y A1 a_867_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 Y B1 a_63_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 a_63_65# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 a_89_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 Y B1 a_89_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 Y B1 a_63_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_867_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 a_867_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 VPWR A2 a_89_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 VGND A2 a_867_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 VPWR A1 a_89_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 a_89_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 a_89_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 a_89_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 Y B2 a_89_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.cdl b/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.cdl
index 0f3d106..a6b1139 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.cdl
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__a22oi_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPB0 Y B1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPB1 Y B2 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
-MMPB0 Y B1 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
-MMPB1 Y B2 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
-MMNA0 Y A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 net55 A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 net55 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 net47 B2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB1 net47 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a22oi_lp
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.netlist.tsv b/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.netlist.tsv
index abed519..8382e8b 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.netlist.tsv
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__a22oi_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	net55	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	net55	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	net47	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	net47	B2	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	net55	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	net55	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	net47	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	net47	B2	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/a22oi/sky130_fd_sc_lp__a22oi_lp.spice b/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.spice
index 5da85a5..5d4bdab 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.spice
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__a22oi_lp A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_357_47# A1 Y VNB nshort w=420000u l=150000u
-+  ad=1.764e+11p pd=1.68e+06u as=1.638e+11p ps=1.62e+06u
-M1001 a_64_409# A2 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=8.5e+11p pd=7.7e+06u as=2.9e+11p ps=2.58e+06u
-M1002 a_64_409# B1 Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1003 VGND A2 a_357_47# VNB nshort w=420000u l=150000u
-+  ad=2.394e+11p pd=2.82e+06u as=0p ps=0u
-M1004 Y B2 a_64_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_171_47# B2 VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1006 VPWR A1 a_64_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B1 a_171_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_64_409# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 Y B1 a_64_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_171_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y A1 a_357_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_64_409# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 VGND B2 a_171_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_357_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR A2 a_64_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_m.cdl b/cells/a22oi/sky130_fd_sc_lp__a22oi_m.cdl
index 1b05418..802fcb3 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_m.cdl
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_m.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__a22oi_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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=0.42 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=0.42 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.42 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.42 l=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.42 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.42 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.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_lp__a22oi_m
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_m.netlist.tsv b/cells/a22oi/sky130_fd_sc_lp__a22oi_m.netlist.tsv
index 3878cf3..d486eda 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_m.netlist.tsv
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_m.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__a22oi_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	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/a22oi/sky130_fd_sc_lp__a22oi_m.spice b/cells/a22oi/sky130_fd_sc_lp__a22oi_m.spice
index 4a85755..6362757 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_m.spice
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_m.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__a22oi_m A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_39_496# A2 VPWR VPB phighvt w=420000u l=150000u
-+  ad=3.822e+11p pd=4.34e+06u as=1.176e+11p ps=1.4e+06u
-M1001 VPWR A1 a_39_496# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_314_47# A1 Y VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.659e+11p ps=1.63e+06u
-M1003 Y B1 a_133_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1004 VGND A2 a_314_47# VNB nshort w=420000u l=150000u
-+  ad=2.52e+11p pd=2.88e+06u as=0p ps=0u
-M1005 Y B2 a_39_496# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1006 a_39_496# B1 Y VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_133_47# B2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 a_39_496# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_39_496# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_314_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR A2 a_39_496# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_39_496# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 Y A1 a_314_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND B2 a_133_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_133_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.cdl b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.cdl
index 1942c61..81395ee 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.cdl
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__a2bb2o_0 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor0 inor A1_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNaoi10 VGND B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi11 sndNB1 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 y inor VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y 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
-MMNaoi11 sndNB1 B2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inor VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB 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
-MMPnor0 VPWR A1_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.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=0.42 l=0.15 mult=1 sa=0.265
+MMPaoi11 pmid B2 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMPaoi20 y inor VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B2 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inor VPB phighvt m=1 w=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_lp__a2bb2o_0
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.netlist.tsv b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.netlist.tsv
index 49491aa..283539a 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.netlist.tsv
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__a2bb2o_0	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inor	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inor	pmid	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inor	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	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	0.42	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	y	inor	pmid	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/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.spice b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.spice
index c1788d9..cea1b2e 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.spice
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a2bb2o_0 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 VGND a_59_194# X VNB nshort w=420000u l=150000u
-+  ad=4.011e+11p pd=4.43e+06u as=1.239e+11p ps=1.43e+06u
-M1001 VGND A2_N a_237_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1002 a_516_535# B1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=3.462e+11p ps=3.47e+06u
-M1003 VPWR a_59_194# X VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1004 a_223_490# A1_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1005 VPWR B2 a_516_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_59_194# a_237_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1007 a_523_47# B2 a_59_194# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1008 VGND B1 a_523_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_237_47# A1_N VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_237_47# A2_N a_223_490# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1011 a_516_535# a_237_47# a_59_194# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 X a_59_194# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_59_194# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_59_194# B2 a_523_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_59_194# a_237_47# a_516_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_237_47# A2_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND A1_N a_237_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_516_535# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VPWR B1 a_516_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_223_490# A2_N a_237_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VGND a_237_47# a_59_194# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_523_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR A1_N a_223_490# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.cdl b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.cdl
index 2d75110..dd363f7 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.cdl
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor0 inor A1_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNaoi10 VGND B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi11 sndNB1 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 y inor VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265
+MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inor VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=1 w=1.26 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=0.42 l=0.15 mult=1 sa=0.265
+MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.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=0.42 l=0.15 mult=1 sa=0.265
+MMPaoi11 pmid B2 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMPaoi20 y inor VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B2 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inor VPB phighvt m=1 w=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_lp__a2bb2o_1
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.netlist.tsv b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.netlist.tsv
index 6ab550f..d4f4169 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.netlist.tsv
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inor	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inor	pmid	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inor	VGND	VNB	nfet_01v8	1	0.42	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.26	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	0.42	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	y	inor	pmid	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/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.spice b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.spice
index b37ff82..9e85269 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.spice
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a2bb2o_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 a_271_367# A1_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=5.271e+11p ps=4.81e+06u
-M1001 a_505_529# B1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=0p ps=0u
-M1002 a_571_47# B2 a_91_269# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.176e+11p ps=1.4e+06u
-M1003 VGND B1 a_571_47# VNB nshort w=420000u l=150000u
-+  ad=6.762e+11p pd=6.05e+06u as=0p ps=0u
-M1004 VPWR B2 a_505_529# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_271_47# A1_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.407e+11p pd=1.51e+06u as=0p ps=0u
-M1006 VGND A2_N a_271_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_271_47# A2_N a_271_367# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1008 a_91_269# a_271_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_91_269# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1010 a_505_529# a_271_47# a_91_269# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1011 VGND a_91_269# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
+X0 a_271_47# A2_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR B1 a_505_529# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_505_529# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_571_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_271_47# a_91_269# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND A1_N a_271_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_91_269# B2 a_571_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR A1_N a_271_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 X a_91_269# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 X a_91_269# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_91_269# a_271_47# a_505_529# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_271_367# A2_N a_271_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.cdl b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.cdl
index f191198..cba969c 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.cdl
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 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
-MMNnor0 inor A1_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNaoi10 VGND B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi11 sndNB1 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 y inor VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=2 w=1.26 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.42 l=0.15 mult=1 sa=0.265
+MMPnor0 VPWR A1_N 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
-MMNaoi20 y inor VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=2 w=1.26 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=0.64 l=0.15 mult=1 sa=0.265
+MMPnor1 sndPA1N A2_N 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
+MMPaoi10 pmid B1 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
-MMPnor1 sndPA1N A2_N VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMPaoi11 pmid B2 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
-MMPaoi10 pmid B1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMPaoi20 y inor 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
-MMPaoi11 pmid B2 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
-MMPaoi20 y inor 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
 .ENDS sky130_fd_sc_lp__a2bb2o_2
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.netlist.tsv b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.netlist.tsv
index a95a097..3512a74 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.netlist.tsv
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inor	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	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	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.84	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inor	VGND	VNB	nfet_01v8	1	0.42	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.26	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	0.64	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pfet_01v8_hvt	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.spice b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.spice
index 2bfc271..1f7aed1 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.spice
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__a2bb2o_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 VPWR a_218_131# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.1136e+12p pd=8.56e+06u as=3.528e+11p ps=3.08e+06u
-M1001 VPWR B1 a_27_481# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.488e+11p ps=3.65e+06u
-M1002 a_218_131# a_260_341# a_27_481# VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1003 X a_218_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_218_131# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=1.04695e+12p ps=8.86e+06u
-M1005 a_480_367# A2_N a_260_341# VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=1.696e+11p ps=1.81e+06u
-M1006 a_260_341# A2_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1007 VGND A1_N a_260_341# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_481# B2 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A1_N a_480_367# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_218_131# B2 a_146_131# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=8.82e+10p ps=1.26e+06u
-M1011 VGND a_260_341# a_218_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_218_131# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_146_131# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_260_341# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_27_481# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 VPWR a_218_131# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND B1 a_146_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 X a_218_131# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_146_131# B2 a_218_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_218_131# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 X a_218_131# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VPWR B2 a_27_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 a_218_131# a_260_341# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND A2_N a_260_341# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_27_481# a_260_341# a_218_131# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 a_260_341# A2_N a_480_367# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 a_480_367# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.cdl b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.cdl
index 4809b99..cce3ce3 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.cdl
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=4 w=0.84 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=2 w=0.84 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8 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
-MMNnor1 inor A2_N VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8 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
-MMNaoi10 VGND B1 VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNaoi10 VGND B1 VNB nfet_01v8 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
+MMNaoi11 sndNB1 B2 VNB nfet_01v8 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
+MMNaoi20 y inor VNB nfet_01v8 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 y VPB pfet_01v8_hvt m=4 w=1.26 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.84 l=0.15 mult=1 sa=0.265
+MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=2 w=1.26 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.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 phighvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265
+MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 l=0.15 mult=1 sa=0.265
+MMPaoi11 pmid B2 VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265
+MMPaoi20 y inor VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a2bb2o_4
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.netlist.tsv b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.netlist.tsv
index 037239a..ba0adca 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.netlist.tsv
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inor	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inor	pmid	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inor	VGND	VNB	nfet_01v8	2	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	4	1.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.spice b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.spice
index 1b17e7e..bedfe19 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.spice
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_lp__a2bb2o_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 a_742_367# A2_N a_436_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=3.528e+11p ps=3.08e+06u
-M1001 a_200_47# a_436_21# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=2.1378e+12p ps=1.685e+07u
-M1002 VGND B1 a_114_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1003 a_200_47# a_436_21# a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=1.3986e+12p ps=1.23e+07u
-M1004 a_742_367# A1_N VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=2.2113e+12p ps=1.863e+07u
-M1005 a_200_47# B2 a_114_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_200_47# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1007 a_114_47# B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_200_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_200_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.182e+11p ps=6.18e+06u
-M1010 a_436_21# A2_N VGND VNB nshort w=840000u l=150000u
-+  ad=4.746e+11p pd=4.49e+06u as=0p ps=0u
-M1011 a_27_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_436_21# A2_N a_742_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_436_21# a_200_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_200_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_200_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_200_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR B1 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A1_N a_742_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR B2 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_27_367# a_436_21# a_200_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_114_47# B2 a_200_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_200_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_200_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND A1_N a_436_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_436_21# A1_N VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_367# B2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A2_N a_436_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_742_367# A2_N a_436_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND A1_N a_436_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VGND a_200_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VGND B1 a_114_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 X a_200_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPWR a_200_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_436_21# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_436_21# A2_N a_742_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND a_200_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_114_47# B2 a_200_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VGND a_436_21# a_200_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 X a_200_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_200_47# a_436_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 X a_200_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VPWR A1_N a_742_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_742_367# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_27_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_27_367# a_436_21# a_200_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VPWR B1 a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VPWR B2 a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 a_27_367# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 a_200_47# B2 a_114_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 VPWR a_200_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 X a_200_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 a_114_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 a_436_21# A2_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 a_200_47# a_436_21# a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 VGND A2_N a_436_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.cdl b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.cdl
index 20027ab..f57dbae 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.cdl
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.cdl
@@ -16,36 +16,36 @@
 
 .SUBCKT sky130_fd_sc_lp__a2bb2o_lp 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 net84 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 net84 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor0 inor A1_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 net55 B2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNaoi11 net55 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inor VNB nshort m=1 w=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 net67 inor VNB nshort m=1 w=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 X y VNB nshort m=1 w=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 VGND B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net75 A2_N VNB nshort m=1 w=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 net48 A1_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB 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
-MMPnor0 VPWR A1_N 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
-MMPnor1 sndPA1N A2_N VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265
+MMNaoi20 y inor VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI9 net67 inor VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI12 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI11 VGND B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inor VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI8 net75 A2_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net48 A1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y 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
+MMPnor0 VPWR A1_N 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
+MMPnor1 sndPA1N A2_N 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
+MMPaoi10 pmid B1 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
+MMPaoi11 pmid B2 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
+MMPaoi20 y inor 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_lp__a2bb2o_lp
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.netlist.tsv b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.netlist.tsv
index 542e442..26f3c0f 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.netlist.tsv
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.netlist.tsv
@@ -1,18 +1,18 @@
 sky130_fd_sc_lp__a2bb2o_lp	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	net84	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor0	MOSFET	inor	A1_N	net48	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	net75	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	net55	B2	y	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inor	net67	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net67	inor	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	X	y	net84	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	VGND	B1	net55	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net75	A2_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net48	A1_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inor	pmid	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	net84	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A1_N	net48	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	A2_N	net75	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	net55	B2	y	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inor	net67	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net67	inor	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	X	y	net84	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	VGND	B1	net55	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net75	A2_N	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net48	A1_N	VGND	VNB	nfet_01v8	1	0.42	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	0.25	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.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	y	inor	pmid	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.spice b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.spice
index fddce91..b542f25 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.spice
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__a2bb2o_lp A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 a_742_74# A1_N VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.549e+11p ps=4.21e+06u
-M1001 a_900_74# A2_N a_284_31# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1002 a_43_408# B1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=5.9e+11p pd=5.18e+06u as=7.2e+11p ps=5.44e+06u
-M1003 VPWR a_63_57# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1004 VGND A2_N a_900_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_63_57# a_284_31# a_43_408# VPB phighvt w=1e+06u l=250000u
-+  ad=5.9e+11p pd=3.18e+06u as=0p ps=0u
-M1006 a_794_409# A1_N VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1007 VGND B1 a_150_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1008 VPWR B2 a_43_408# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_150_57# B2 a_63_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.82e+06u
-M1010 a_584_74# a_63_57# X VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1011 VGND a_63_57# a_584_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_314_57# a_284_31# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1013 a_284_31# A1_N a_742_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_63_57# a_284_31# a_314_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_284_31# A2_N a_794_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
+X0 X a_63_57# a_584_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_63_57# B2 a_150_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_314_57# a_284_31# a_63_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_43_408# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_150_57# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_284_31# a_314_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 X a_63_57# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_900_74# A2_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_584_74# a_63_57# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR A1_N a_794_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 VGND A1_N a_742_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR B1 a_43_408# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 a_43_408# a_284_31# a_63_57# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X13 a_742_74# A1_N a_284_31# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_794_409# A2_N a_284_31# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X15 a_284_31# A2_N a_900_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.cdl b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.cdl
index 35d85a1..f119d77 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.cdl
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__a2bb2o_m 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor0 inor A1_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNaoi10 VGND B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi11 sndNB1 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 y inor VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNB1 B2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inor VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265
+MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.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=0.42 l=0.15 mult=1 sa=0.265
+MMPaoi11 pmid B2 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMPaoi20 y inor VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B2 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inor VPB phighvt m=1 w=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_lp__a2bb2o_m
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.netlist.tsv b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.netlist.tsv
index 7b694e7..71f13d8 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.netlist.tsv
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__a2bb2o_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inor	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inor	pmid	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	y	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inor	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	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	0.42	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	y	inor	pmid	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/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.spice b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.spice
index c6867b1..6340ff7 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.spice
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a2bb2o_m A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 VPWR a_85_345# X VPB phighvt w=420000u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=1.197e+11p ps=1.41e+06u
-M1001 VGND A2_N a_210_125# VNB nshort w=420000u l=150000u
-+  ad=3.465e+11p pd=4.17e+06u as=2.2975e+11p ps=2.03e+06u
-M1002 a_85_345# a_210_125# VGND VNB nshort w=420000u l=150000u
-+  ad=2.247e+11p pd=1.91e+06u as=0p ps=0u
-M1003 a_223_535# A1_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 a_210_125# A1_N VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR B2 a_479_429# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.289e+11p ps=2.77e+06u
-M1006 VGND a_85_345# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1007 a_210_125# A2_N a_223_535# VPB phighvt w=420000u l=150000u
-+  ad=1.141e+11p pd=1.41e+06u as=0p ps=0u
-M1008 a_479_429# B1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_551_125# B2 a_85_345# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1010 VGND B1 a_551_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_479_429# a_210_125# a_85_345# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.141e+11p ps=1.41e+06u
+X0 VPWR B1 a_479_429# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VGND A1_N a_210_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR A1_N a_223_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_223_535# A2_N a_210_125# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 X a_85_345# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_551_125# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_210_125# A2_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_85_345# a_210_125# a_479_429# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 X a_85_345# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_85_345# B2 a_551_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND a_210_125# a_85_345# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_479_429# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.cdl b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.cdl
index 61d4815..20c546f 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.cdl
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a2bb2oi_0 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.42 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNB1 B2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inor VNB nshort m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA1N A2_N VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNaoi20 Y inor VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMPnor0 VPWR A1_N 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
-MMPaoi11 pmid B2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMPnor1 sndPA1N A2_N 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
+MMPaoi10 pmid B1 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
-MMPaoi20 Y inor 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
+MMPaoi11 pmid B2 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
+MMPaoi20 Y inor 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_lp__a2bb2oi_0
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.netlist.tsv b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.netlist.tsv
index 455b63f..e937e5a 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.netlist.tsv
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a2bb2oi_0	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inor	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	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	0.64	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inor	VGND	VNB	nfet_01v8	1	0.42	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	0.64	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pfet_01v8_hvt	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.spice b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.spice
index 492cabf..82d964d 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.spice
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a2bb2oi_0 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 a_481_47# B2 Y VNB nshort w=420000u l=150000u
-+  ad=1.596e+11p pd=1.6e+06u as=1.176e+11p ps=1.4e+06u
-M1001 a_420_387# B1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=3.488e+11p pd=3.65e+06u as=3.488e+11p ps=3.65e+06u
-M1002 VGND B1 a_481_47# VNB nshort w=420000u l=150000u
-+  ad=5.775e+11p pd=5.27e+06u as=0p ps=0u
-M1003 a_110_47# A1_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1004 VPWR B2 a_420_387# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_110_47# A2_N a_110_427# VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=1.344e+11p ps=1.7e+06u
-M1006 VGND A2_N a_110_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_110_427# A1_N VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y a_110_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_420_387# a_110_47# Y VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
+X0 Y a_110_47# a_420_387# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_420_387# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 VGND A1_N a_110_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR B1 a_420_387# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 a_481_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_110_47# Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 Y B2 a_481_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_110_427# A2_N a_110_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 a_110_47# A2_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR A1_N a_110_427# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.cdl b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.cdl
index e979665..d87a67e 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.cdl
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNB1 B2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inor VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor0 VPWR A1_N VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA1N A2_N VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MMNaoi20 Y inor VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265
+MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a2bb2oi_1
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.netlist.tsv b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.netlist.tsv
index 0728e49..b4cfe12 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.netlist.tsv
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inor	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inor	pmid	VPB	phighvt	1	1.26	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.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inor	VGND	VNB	nfet_01v8	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.spice b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.spice
index db01380..79d1d18 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.spice
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a2bb2oi_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 a_381_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.93e+11p pd=6.14e+06u as=8.379e+11p ps=6.37e+06u
-M1001 Y a_113_47# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=1.1046e+12p ps=7.67e+06u
-M1002 a_381_367# a_113_47# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1003 a_113_47# A1_N VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1004 VGND B1 a_467_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=3.192e+11p ps=2.44e+06u
-M1005 a_113_367# A1_N VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.024e+11p pd=3e+06u as=0p ps=0u
-M1006 VGND A2_N a_113_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_467_47# B2 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_113_47# A2_N a_113_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1009 VPWR B2 a_381_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B2 a_467_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND A1_N a_113_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR A1_N a_113_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 Y a_113_47# a_381_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_381_367# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VPWR B1 a_381_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_467_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VGND a_113_47# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_113_47# A2_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_113_367# A2_N a_113_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.cdl b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.cdl
index 2d1a3b2..a0ef14a 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.cdl
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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=2 w=0.84 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8 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
-MMNnor1 inor A2_N VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8 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
-MMNaoi10 VGND B1 VNB nshort 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
-MMNaoi11 sndNB1 B2 VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND B1 VNB nfet_01v8 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
-MMNaoi20 Y inor VNB nshort 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
-MMPnor0 VPWR A1_N VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 VNB nfet_01v8 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
-MMPnor1 sndPA1N A2_N VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
+MMNaoi20 Y inor VNB nfet_01v8 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 pmid B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
+MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265
+MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a2bb2oi_2
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.netlist.tsv b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.netlist.tsv
index 481f689..296866b 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.netlist.tsv
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inor	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inor	pmid	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inor	VGND	VNB	nfet_01v8	2	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.spice b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.spice
index 4320fdc..a7e582d 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.spice
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__a2bb2oi_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 VGND A2_N a_459_39# VNB nshort w=840000u l=150000u
-+  ad=1.7262e+12p pd=1.251e+07u as=4.704e+11p ps=4.48e+06u
-M1001 VPWR A1_N a_699_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.26e+12p pd=9.56e+06u as=1.0206e+12p ps=9.18e+06u
-M1002 a_30_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.3734e+12p pd=1.226e+07u as=0p ps=0u
-M1003 Y a_459_39# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1004 Y B2 a_113_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=5.376e+11p ps=4.64e+06u
-M1005 a_30_367# B2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_459_39# A2_N a_699_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1007 a_30_367# a_459_39# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1008 a_113_65# B2 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_459_39# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A1_N a_459_39# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR B1 a_30_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR B2 a_30_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_699_367# A1_N VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_699_367# A2_N a_459_39# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B1 a_113_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y a_459_39# a_30_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_459_39# A2_N VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_113_65# B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_459_39# A1_N VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_459_39# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND A2_N a_459_39# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_30_367# a_459_39# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR B1 a_30_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR B2 a_30_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_113_65# B2 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Y B2 a_113_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_30_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 Y a_459_39# a_30_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_113_65# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VPWR A1_N a_699_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_30_367# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_699_367# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 VGND a_459_39# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 Y a_459_39# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_459_39# A2_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 VGND A1_N a_459_39# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_459_39# A2_N a_699_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 a_699_367# A2_N a_459_39# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VGND B1 a_113_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.cdl b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.cdl
index bf8d5ed..2873656 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.cdl
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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=4 w=0.84 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8 m=4 w=0.84 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=4 w=0.84 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8 m=4 w=0.84 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.84 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.84 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND B1 VNB nfet_01v8 m=4 w=0.84 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.84 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=4 w=1.26 l=0.15 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 VNB nfet_01v8 m=4 w=0.84 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=4 w=1.26 l=0.15 mult=1 sa=0.265
+MMNaoi20 Y inor VNB nfet_01v8 m=4 w=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 pmid B1 VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265
+MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265
+MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a2bb2oi_4
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.netlist.tsv b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.netlist.tsv
index 8e1fdc2..a44b8f7 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.netlist.tsv
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inor	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inor	pmid	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A1_N	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inor	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	pfet_01v8_hvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	pfet_01v8_hvt	4	1.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.spice b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.spice
index 89faa67..8fbfddd 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.spice
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__a2bb2oi_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 a_73_367# B2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.4318e+12p pd=2.15e+07u as=2.33e+12p ps=1.888e+07u
-M1001 Y a_832_21# a_73_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1002 a_73_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND B1 a_157_47# VNB nshort w=840000u l=150000u
-+  ad=2.5998e+12p pd=2.131e+07u as=9.408e+11p ps=8.96e+06u
-M1004 Y B2 a_157_47# VNB nshort w=840000u l=150000u
-+  ad=9.408e+11p pd=8.96e+06u as=0p ps=0u
-M1005 a_73_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_832_21# A1_N VGND VNB nshort w=840000u l=150000u
-+  ad=9.408e+11p pd=8.96e+06u as=0p ps=0u
-M1007 a_832_21# A2_N VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_1241_367# A1_N VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7262e+12p pd=1.534e+07u as=0p ps=0u
-M1009 a_832_21# A2_N a_1241_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1010 Y B2 a_157_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_832_21# A1_N VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_73_367# B2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_157_47# B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR B1 a_73_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_832_21# A2_N a_1241_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_73_367# a_832_21# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_832_21# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR B1 a_73_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1241_367# A1_N VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_157_47# B2 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR B2 a_73_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A1_N a_832_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_157_47# B2 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND A2_N a_832_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND B1 a_157_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND A1_N a_832_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_832_21# A2_N VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_73_367# a_832_21# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR A1_N a_1241_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y a_832_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND a_832_21# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1241_367# A2_N a_832_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1241_367# A2_N a_832_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR B2 a_73_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_157_47# B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Y a_832_21# a_73_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Y a_832_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR A1_N a_1241_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND A2_N a_832_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B1 a_157_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_832_21# A2_N a_1241_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_157_47# B2 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_73_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR B2 a_73_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VPWR A1_N a_1241_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_1241_367# A2_N a_832_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 Y B2 a_157_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND a_832_21# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_73_367# a_832_21# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_73_367# a_832_21# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VGND A1_N a_832_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VPWR B1 a_73_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 VGND B1 a_157_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 VGND a_832_21# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_157_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_832_21# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 VPWR B2 a_73_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 a_73_367# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_832_21# A2_N a_1241_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 VPWR B1 a_73_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 a_157_47# B2 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 Y B2 a_157_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 Y a_832_21# a_73_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 Y a_832_21# a_73_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 Y a_832_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 VGND A2_N a_832_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 a_73_367# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 a_1241_367# A2_N a_832_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 a_1241_367# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 Y a_832_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X31 a_832_21# A2_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X32 a_157_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X33 VGND A2_N a_832_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X34 a_73_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X35 a_1241_367# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X36 a_832_21# A2_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X37 VPWR A1_N a_1241_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X38 VGND A1_N a_832_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X39 a_832_21# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.cdl b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.cdl
index 01dc97e..3520637 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.cdl
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.cdl
@@ -16,30 +16,30 @@
 
 .SUBCKT sky130_fd_sc_lp__a2bb2oi_lp 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.42 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 net46 B2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNaoi11 net46 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net62 A2_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 net51 inor VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI8 net62 A2_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 VGND B1 VNB nshort m=1 w=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 Y inor VNB nshort m=1 w=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 net39 A1_N VNB nshort m=1 w=0.42 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 l=0.25 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 l=0.25 mult=1 sa=0.265
+MMNaoi20 net51 inor VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI11 VGND B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI9 Y inor VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inor VPB 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
+MI7 net39 A1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A1_N 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
+MMPnor1 sndPA1N A2_N 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
+MMPaoi10 pmid B1 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
+MMPaoi11 pmid B2 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
+MMPaoi20 Y inor 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_lp__a2bb2oi_lp
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.netlist.tsv b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.netlist.tsv
index 5644377..b1f4324 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.netlist.tsv
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.netlist.tsv
@@ -1,15 +1,15 @@
 sky130_fd_sc_lp__a2bb2oi_lp	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	net39	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	net62	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	net46	B2	Y	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net62	A2_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	net51	inor	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	VGND	B1	net46	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Y	inor	net51	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net39	A1_N	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inor	pmid	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A1_N	net39	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	A2_N	net62	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	net46	B2	Y	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net62	A2_N	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	net51	inor	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	VGND	B1	net46	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Y	inor	net51	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net39	A1_N	VGND	VNB	nfet_01v8	1	0.42	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.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inor	pmid	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.spice b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.spice
index 2b77aab..d9e6b5d 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.spice
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.spice
@@ -16,30 +16,17 @@
 
 
 .subckt sky130_fd_sc_lp__a2bb2oi_lp A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 VGND A1_N a_652_47# VNB nshort w=420000u l=150000u
-+  ad=3.612e+11p pd=4.24e+06u as=8.82e+10p ps=1.26e+06u
-M1001 Y B2 a_170_47# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.008e+11p ps=1.32e+06u
-M1002 Y a_296_146# a_27_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.8e+11p pd=2.56e+06u as=5.65e+11p ps=5.13e+06u
-M1003 VPWR B1 a_27_409# VPB phighvt w=1e+06u l=250000u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1004 VGND a_296_146# a_334_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1005 a_652_47# A1_N a_296_146# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1006 a_334_47# a_296_146# Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_409# B2 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_296_146# A2_N a_456_339# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=5.7e+11p ps=5.14e+06u
-M1009 VPWR A1_N a_456_339# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_170_47# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_494_47# A2_N VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1012 a_296_146# A2_N a_494_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B2 a_27_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_494_47# A2_N a_296_146# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_296_146# A1_N a_652_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_652_47# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_27_409# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 VGND A2_N a_494_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_27_409# a_296_146# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_456_339# A2_N a_296_146# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_456_339# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_170_47# B2 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 Y a_296_146# a_334_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND B1 a_170_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_334_47# a_296_146# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.cdl b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.cdl
index a936c02..230cc3e 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.cdl
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a2bb2oi_m 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.42 l=0.15 mult=1 sa=0.265
+MMNnor0 inor A1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnor1 inor A2_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnor1 inor A2_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 sndNB1 B2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNaoi10 VGND B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inor VNB nshort m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265
+MMNaoi11 sndNB1 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnor1 sndPA1N A2_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNaoi20 Y inor VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid B1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMPnor0 VPWR A1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 pmid B2 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMPnor1 sndPA1N A2_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 pmid B1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi11 pmid B2 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inor VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a2bb2oi_m
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.netlist.tsv b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.netlist.tsv
index a8dd0a3..6c54f16 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.netlist.tsv
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a2bb2oi_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	A2_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inor	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A1_N	sndPA1N	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA1N	A2_N	inor	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inor	pmid	VPB	phighvt	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	B1	sndNB1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNB1	B2	Y	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inor	VGND	VNB	nfet_01v8	1	0.42	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	0.42	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	B1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inor	pmid	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/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.spice b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.spice
index 2838f32..1c7e5bc 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.spice
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a2bb2oi_m A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 VGND A2_N a_202_47# VNB nshort w=420000u l=150000u
-+  ad=3.633e+11p pd=4.25e+06u as=1.176e+11p ps=1.4e+06u
-M1001 Y a_202_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1002 a_202_47# A2_N a_132_517# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1003 VPWR B2 a_403_387# VPB phighvt w=420000u l=150000u
-+  ad=2.625e+11p pd=2.93e+06u as=2.289e+11p ps=2.77e+06u
-M1004 VGND B1 a_467_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1005 a_202_47# A1_N VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_403_387# a_202_47# Y VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 a_132_517# A1_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_467_47# B2 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_403_387# B1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_202_47# A2_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 Y B2 a_467_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR A1_N a_132_517# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_467_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_403_387# B2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 Y a_202_47# a_403_387# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VGND A1_N a_202_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_202_47# Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR B1 a_403_387# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_132_517# A2_N a_202_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_0.cdl b/cells/a311o/sky130_fd_sc_lp__a311o_0.cdl
index 0a47cf7..e70ac58 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_0.cdl
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_0.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__a311o_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPA2 pndA A3 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
+MMPB0 pndB B1 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
+MMPC0 y C1 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
+MMIPX X y 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
-MMPA1 pndA A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=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.42 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.42 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=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=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.42 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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a311o_0
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_0.netlist.tsv b/cells/a311o/sky130_fd_sc_lp__a311o_0.netlist.tsv
index 9b01aef..88e24a0 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_0.netlist.tsv
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_0.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__a311o_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a311o/sky130_fd_sc_lp__a311o_0.spice b/cells/a311o/sky130_fd_sc_lp__a311o_0.spice
index d9e0c03..32b4025 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_0.spice
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_0.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a311o_0 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 a_72_312# C1 a_558_486# VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=1.344e+11p ps=1.7e+06u
-M1001 a_72_312# A1 a_330_48# VNB nshort w=420000u l=150000u
-+  ad=3.507e+11p pd=3.35e+06u as=1.638e+11p ps=1.62e+06u
-M1002 a_558_486# B1 a_224_486# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.84e+11p ps=3.76e+06u
-M1003 a_72_312# C1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.814e+11p ps=3.02e+06u
-M1004 VPWR a_72_312# X VPB phighvt w=640000u l=150000u
-+  ad=5.76e+11p pd=4.36e+06u as=1.824e+11p ps=1.85e+06u
-M1005 VPWR A2 a_224_486# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_72_312# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 a_224_486# A1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_224_486# A3 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_330_48# A2 a_246_48# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1010 VGND B1 a_72_312# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_246_48# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A3 a_224_486# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_558_486# C1 a_72_312# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_72_312# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 X a_72_312# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 a_246_48# A2 a_330_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND C1 a_72_312# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_224_486# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 X a_72_312# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_224_486# B1 a_558_486# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 a_330_48# A1 a_72_312# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VPWR A1 a_224_486# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 VGND A3 a_246_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_1.cdl b/cells/a311o/sky130_fd_sc_lp__a311o_1.cdl
index bd7eeec..989023c 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_1.cdl
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB phighvt m=1 w=1.26 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.26 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.84 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.84 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.84 l=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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a311o_1
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_1.netlist.tsv b/cells/a311o/sky130_fd_sc_lp__a311o_1.netlist.tsv
index 2b7fa69..1b0ff26 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_1.netlist.tsv
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_1.spice b/cells/a311o/sky130_fd_sc_lp__a311o_1.spice
index 69ce69a..cfcfd4d 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_1.spice
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a311o_1 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 VPWR A2 a_259_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.2348e+12p pd=7e+06u as=8.442e+11p ps=6.38e+06u
-M1001 a_363_47# A2 a_273_47# VNB nshort w=840000u l=150000u
-+  ad=2.52e+11p pd=2.28e+06u as=2.52e+11p ps=2.28e+06u
-M1002 a_80_21# A1 a_363_47# VNB nshort w=840000u l=150000u
-+  ad=6.006e+11p pd=4.79e+06u as=0p ps=0u
-M1003 VPWR a_80_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1004 VGND a_80_21# X VNB nshort w=840000u l=150000u
-+  ad=8.862e+11p pd=5.47e+06u as=2.226e+11p ps=2.21e+06u
-M1005 a_259_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_259_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B1 a_80_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_80_21# C1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_273_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_80_21# C1 a_609_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=2.646e+11p ps=2.94e+06u
-M1011 a_609_367# B1 a_259_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_259_367# B1 a_609_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_609_367# C1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR A1 a_259_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_363_47# A1 a_80_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR A3 a_259_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_273_47# A2 a_363_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND A3 a_273_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_259_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_80_21# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VGND C1 a_80_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_2.cdl b/cells/a311o/sky130_fd_sc_lp__a311o_2.cdl
index b3e24e2..e62554f 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_2.cdl
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 y C1 VPB phighvt m=1 w=1.26 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.26 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.84 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.84 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.84 l=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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 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_lp__a311o_2
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_2.netlist.tsv b/cells/a311o/sky130_fd_sc_lp__a311o_2.netlist.tsv
index b4f2f6b..4b63198 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_2.netlist.tsv
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_2.spice b/cells/a311o/sky130_fd_sc_lp__a311o_2.spice
index f8cce18..fb03fe4 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_2.spice
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__a311o_2 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 a_85_21# A1 a_427_47# VNB nshort w=840000u l=150000u
-+  ad=5.502e+11p pd=4.67e+06u as=3.276e+11p ps=2.46e+06u
-M1001 X a_85_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=1.6506e+12p ps=1.018e+07u
-M1002 a_85_21# C1 a_657_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=4.032e+11p ps=3.16e+06u
-M1003 VGND B1 a_85_21# VNB nshort w=840000u l=150000u
-+  ad=1.0878e+12p pd=7.63e+06u as=0p ps=0u
-M1004 VPWR a_85_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_341_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1006 a_427_47# A2 a_355_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=2.1e+06u
-M1007 a_657_367# B1 a_341_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_85_21# C1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A2 a_341_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_355_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_341_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_85_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1013 X a_85_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_85_21# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_341_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 X a_85_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VGND C1 a_85_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND A3 a_355_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_657_367# C1 a_85_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VPWR a_85_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_341_367# B1 a_657_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_355_47# A2 a_427_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VPWR A1 a_341_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR A3 a_341_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 X a_85_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VGND a_85_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_427_47# A1 a_85_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_4.cdl b/cells/a311o/sky130_fd_sc_lp__a311o_4.cdl
index 78ea96d..5e1695e 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_4.cdl
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 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
-MMPA2 pndA A3 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 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
+MMNA2 sndA2 A3 VNB nfet_01v8 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
+MMNB0 y B1 VNB nfet_01v8 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
-MMPB0 pndB B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 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 y C1 VPB phighvt m=2 w=1.26 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.26 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.84 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.84 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.84 l=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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=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_lp__a311o_4
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_4.netlist.tsv b/cells/a311o/sky130_fd_sc_lp__a311o_4.netlist.tsv
index b9b9d96..c2ad802 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_4.netlist.tsv
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_4.spice b/cells/a311o/sky130_fd_sc_lp__a311o_4.spice
index f834746..1d53182 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_4.spice
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_lp__a311o_4 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 a_111_47# B1 VGND VNB nshort w=840000u l=150000u
-+  ad=7.056e+11p pd=6.72e+06u as=1.7724e+12p ps=1.43e+07u
-M1001 VPWR a_111_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.4794e+12p pd=1.928e+07u as=9.6e+11p ps=6.66e+06u
-M1002 a_111_47# C1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_111_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_1098_69# A1 a_111_47# VNB nshort w=840000u l=150000u
-+  ad=6.804e+11p pd=6.66e+06u as=0p ps=0u
-M1005 a_877_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=5.334e+11p pd=4.63e+06u as=0p ps=0u
-M1006 a_1098_69# A2 a_877_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A3 a_283_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.4616e+12p ps=1.24e+07u
-M1008 VPWR A1 a_283_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_111_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND C1 a_111_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_111_47# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1012 VGND a_111_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_28_367# C1 a_111_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0206e+12p pd=9.18e+06u as=3.528e+11p ps=3.08e+06u
-M1014 X a_111_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_111_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A3 a_877_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A2 a_283_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_877_47# A2 a_1098_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_283_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND B1 a_111_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_111_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_111_47# A1 a_1098_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_283_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_28_367# B1 a_283_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_283_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_111_47# C1 a_28_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_283_367# B1 a_28_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_111_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_283_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_283_367# B1 a_28_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR A2 a_283_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_111_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_1098_69# A2 a_877_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_111_47# C1 a_28_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_28_367# C1 a_111_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 X a_111_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR a_111_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR A1 a_283_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VPWR a_111_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 X a_111_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_28_367# B1 a_283_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_111_47# C1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VGND A3 a_877_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_877_47# A2 a_1098_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_877_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_283_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VGND a_111_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 X a_111_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 a_283_367# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 a_1098_69# A1 a_111_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 VPWR A3 a_283_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 VGND C1 a_111_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 a_111_47# A1 a_1098_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 X a_111_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 VGND B1 a_111_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_lp.cdl b/cells/a311o/sky130_fd_sc_lp__a311o_lp.cdl
index 2cd95a7..860b249 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_lp.cdl
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_lp.cdl
@@ -16,34 +16,34 @@
 
 .SUBCKT sky130_fd_sc_lp__a311o_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPA2 pndA A3 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
+MMPB0 pndB B1 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
+MMPC0 y C1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIPX X y 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
-MMPA2 pndA A3 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 net103 A2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 net99 A3 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 net70 B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI12 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 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 l=0.25 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA1 net103 A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 net99 A3 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 net79 C1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 net70 B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net75 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 y A1 VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=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 net79 C1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net75 y VNB nshort m=1 w=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 y B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI10 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a311o_lp
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_lp.netlist.tsv b/cells/a311o/sky130_fd_sc_lp__a311o_lp.netlist.tsv
index ff7d21b..8af9e84 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_lp.netlist.tsv
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_lp.netlist.tsv
@@ -1,17 +1,17 @@
 sky130_fd_sc_lp__a311o_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	net103	A2	net99	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	net99	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	net70	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	y	A1	net103	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	net79	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	net75	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net79	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net75	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	y	B1	net70	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	net103	A2	net99	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	net99	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	net70	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	y	A1	net103	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	net79	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	net75	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net79	C1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net75	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	y	B1	net70	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_lp.spice b/cells/a311o/sky130_fd_sc_lp__a311o_lp.spice
index 0d1ede2..586ca6f 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_lp.spice
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_lp.spice
@@ -16,34 +16,19 @@
 
 
 .subckt sky130_fd_sc_lp__a311o_lp A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 a_257_414# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=5.6e+11p pd=5.12e+06u as=6.65e+11p ps=5.33e+06u
-M1001 a_372_47# A2 a_294_47# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.008e+11p ps=1.32e+06u
-M1002 a_85_21# A1 a_372_47# VNB nshort w=420000u l=150000u
-+  ad=2.373e+11p pd=2.81e+06u as=0p ps=0u
-M1003 a_257_414# A3 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_294_47# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.793e+11p ps=3.01e+06u
-M1005 VGND B1 a_536_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1006 VPWR a_85_21# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1007 VGND a_85_21# a_115_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1008 VPWR A2 a_257_414# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_85_21# C1 a_596_414# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=5.25e+11p ps=3.05e+06u
-M1010 a_536_47# B1 a_85_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_596_414# B1 a_257_414# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_694_47# C1 VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1013 a_85_21# C1 a_694_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_115_47# a_85_21# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
+X0 a_257_414# B1 a_596_414# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_257_414# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 VGND A3 a_294_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_596_414# C1 a_85_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 VPWR A3 a_257_414# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_372_47# A1 a_85_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_694_47# C1 a_85_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR A1 a_257_414# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_85_21# B1 a_536_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_115_47# a_85_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_294_47# A2 a_372_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 X a_85_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 X a_85_21# a_115_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_536_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VGND C1 a_694_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_m.cdl b/cells/a311o/sky130_fd_sc_lp__a311o_m.cdl
index b43f885..2a06dcd 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_m.cdl
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_m.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__a311o_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=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.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.42 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=0.42 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=0.42 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.42 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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a311o_m
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_m.netlist.tsv b/cells/a311o/sky130_fd_sc_lp__a311o_m.netlist.tsv
index fd813c4..9e59c3b 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_m.netlist.tsv
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_m.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__a311o_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	y	C1	pndB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	y	C1	pndB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a311o/sky130_fd_sc_lp__a311o_m.spice b/cells/a311o/sky130_fd_sc_lp__a311o_m.spice
index a8fce9e..0c94187 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_m.spice
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_m.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a311o_m A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 VGND B1 a_54_154# VNB nshort w=420000u l=150000u
-+  ad=2.982e+11p pd=3.1e+06u as=2.289e+11p ps=2.77e+06u
-M1001 VGND a_54_154# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1002 VPWR a_54_154# X VPB phighvt w=420000u l=150000u
-+  ad=3.1835e+11p pd=3.23e+06u as=1.113e+11p ps=1.37e+06u
-M1003 VPWR A2 a_196_403# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1004 a_486_403# B1 a_196_403# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1005 a_54_154# C1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_220_48# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1007 a_54_154# C1 a_486_403# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1008 a_292_48# A2 a_220_48# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1009 a_54_154# A1 a_292_48# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_196_403# A1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_196_403# A3 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_196_403# B1 a_486_403# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_486_403# C1 a_54_154# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VPWR A1 a_196_403# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VPWR A3 a_196_403# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_220_48# A2 a_292_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND C1 a_54_154# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 X a_54_154# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_196_403# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VGND A3 a_220_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 X a_54_154# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_292_48# A1 a_54_154# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_54_154# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_0.cdl b/cells/a311oi/sky130_fd_sc_lp__a311oi_0.cdl
index c357804..4e4b0f1 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_0.cdl
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a311oi_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPA2 pndA A3 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
+MMPB0 pndB B1 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
+MMPC0 Y C1 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
+MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=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.42 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=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=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=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.42 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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=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_lp__a311oi_0
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_0.netlist.tsv b/cells/a311oi/sky130_fd_sc_lp__a311oi_0.netlist.tsv
index 6efd5e1..a625f62 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_0.netlist.tsv
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a311oi_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	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/a311oi/sky130_fd_sc_lp__a311oi_0.spice b/cells/a311oi/sky130_fd_sc_lp__a311oi_0.spice
index 7a95e84..f7496f5 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_0.spice
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a311oi_0 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_158_473# A3 VPWR VPB phighvt w=640000u l=150000u
-+  ad=4.096e+11p pd=3.84e+06u as=3.488e+11p ps=3.65e+06u
-M1001 a_158_473# A1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_432_473# B1 a_158_473# VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1003 Y A1 a_252_47# VNB nshort w=420000u l=150000u
-+  ad=2.415e+11p pd=2.83e+06u as=8.82e+10p ps=1.26e+06u
-M1004 Y C1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=5.145e+11p ps=4.13e+06u
-M1005 VPWR A2 a_158_473# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_180_47# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1007 a_252_47# A2 a_180_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y C1 a_432_473# VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1009 VGND B1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_158_473# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_432_473# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 VPWR A1 a_158_473# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_180_47# A2 a_252_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_252_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_158_473# B1 a_432_473# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 VGND A3 a_180_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR A3 a_158_473# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_1.cdl b/cells/a311oi/sky130_fd_sc_lp__a311oi_1.cdl
index 20a813c..3c97dd4 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_1.cdl
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=1.26 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.26 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.26 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.84 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.84 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.84 l=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a311oi_1
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_1.netlist.tsv b/cells/a311oi/sky130_fd_sc_lp__a311oi_1.netlist.tsv
index 9aac7fd..b415b78 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_1.netlist.tsv
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_1.spice b/cells/a311oi/sky130_fd_sc_lp__a311oi_1.spice
index 13724e0..60085f7 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_1.spice
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a311oi_1 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 VPWR A2 a_181_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=9.702e+11p pd=6.58e+06u as=9.324e+11p ps=6.52e+06u
-M1001 a_181_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=5.88e+11p pd=4.76e+06u as=5.754e+11p ps=4.73e+06u
-M1003 a_181_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1004 Y C1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_520_367# B1 a_181_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1006 Y C1 a_520_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1007 Y A1 a_270_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.562e+11p ps=2.29e+06u
-M1008 a_270_47# A2 a_181_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_181_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A3 a_181_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_270_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR A1 a_181_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND A3 a_181_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_181_47# A2 a_270_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_181_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_181_367# B1 a_520_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_520_367# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_2.cdl b/cells/a311oi/sky130_fd_sc_lp__a311oi_2.cdl
index c386890..a24bce1 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_2.cdl
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 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
+MMNA2 sndA2 A3 VNB nfet_01v8 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
+MMNB0 Y B1 VNB nfet_01v8 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
-MMPA2 pndA A3 VPB phighvt m=2 w=1.26 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.26 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.26 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.84 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.84 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.84 l=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 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_lp__a311oi_2
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_2.netlist.tsv b/cells/a311oi/sky130_fd_sc_lp__a311oi_2.netlist.tsv
index 90206d6..fb52523 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_2.netlist.tsv
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_2.spice b/cells/a311oi/sky130_fd_sc_lp__a311oi_2.spice
index 2d81952..1375e06 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_2.spice
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__a311oi_2 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_135_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=1.6695e+12p ps=1.273e+07u
-M1001 a_727_367# C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0206e+12p pd=9.18e+06u as=3.528e+11p ps=3.08e+06u
-M1002 VPWR A2 a_135_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_135_367# B1 a_727_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y C1 VGND VNB nshort w=840000u l=150000u
-+  ad=9.996e+11p pd=9.1e+06u as=7.056e+11p ps=6.72e+06u
-M1005 a_307_69# A2 a_48_69# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=7.56e+11p ps=6.84e+06u
-M1006 Y B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_307_69# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A1 a_307_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y C1 a_727_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_135_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A1 a_135_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_48_69# A2 a_307_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_135_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A3 a_48_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_48_69# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND C1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A3 a_135_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_727_367# B1 a_135_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_727_367# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VGND A3 a_48_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR A1 a_135_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 Y A1 a_307_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_135_367# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VPWR A2 a_135_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_135_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_48_69# A2 a_307_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_307_69# A2 a_48_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VPWR A3 a_135_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_135_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_48_69# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_307_69# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 Y C1 a_727_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_135_367# B1 a_727_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 a_727_367# B1 a_135_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_4.cdl b/cells/a311oi/sky130_fd_sc_lp__a311oi_4.cdl
index cc40daf..f269b7e 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_4.cdl
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.84 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.84 l=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.84 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.26 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.26 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.26 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.84 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.84 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.84 l=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=4 w=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_lp__a311oi_4
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_4.netlist.tsv b/cells/a311oi/sky130_fd_sc_lp__a311oi_4.netlist.tsv
index be190e6..1311215 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_4.netlist.tsv
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_4.spice b/cells/a311oi/sky130_fd_sc_lp__a311oi_4.spice
index 0a50756..96dd161 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_4.spice
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__a311oi_4 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 Y A1 a_454_47# VNB nshort w=840000u l=150000u
-+  ad=1.6296e+12p pd=1.564e+07u as=9.408e+11p ps=8.96e+06u
-M1001 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=1.4952e+12p pd=1.364e+07u as=0p ps=0u
-M1002 a_124_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.8224e+12p pd=2.464e+07u as=2.5704e+12p ps=2.172e+07u
-M1003 Y C1 a_1199_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=1.7262e+12p ps=1.534e+07u
-M1004 a_124_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y C1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_124_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_124_367# B1 a_1199_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A3 a_124_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_47# A2 a_454_47# VNB nshort w=840000u l=150000u
-+  ad=1.1508e+12p pd=1.114e+07u as=0p ps=0u
-M1010 VPWR A1 a_124_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y C1 a_1199_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A3 a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A2 a_124_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y C1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A1 a_124_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_454_47# A2 a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A2 a_124_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y A1 a_454_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_27_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_124_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_27_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1199_367# B1 a_124_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_124_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1199_367# C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_454_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1199_367# B1 a_124_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND C1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND C1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_27_47# A2 a_454_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_454_47# A2 a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR A3 a_124_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_124_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_124_367# B1 a_1199_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_454_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1199_367# C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND A3 a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_454_47# A2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VPWR A1 a_124_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VGND A3 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_27_47# A2 a_454_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR A2 a_124_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_27_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_454_47# A2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VPWR A3 a_124_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_1199_367# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 Y A1 a_454_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VPWR A3 a_124_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_124_367# B1 a_1199_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_124_367# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_1199_367# B1 a_124_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_454_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 Y A1 a_454_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 a_124_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 a_1199_367# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 VPWR A2 a_124_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 a_1199_367# B1 a_124_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 Y C1 a_1199_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 a_124_367# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 a_124_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 VPWR A1 a_124_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 VGND A3 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X30 a_454_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X31 a_124_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X32 a_27_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X33 Y C1 a_1199_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X34 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X35 a_124_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X36 a_27_47# A2 a_454_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X37 Y C1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X38 a_124_367# B1 a_1199_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X39 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.cdl b/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.cdl
index 80cdb5d..8621d73 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.cdl
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__a311oi_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPA2 pndA A3 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
+MMPB0 pndB B1 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
+MMPC0 Y C1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 net87 A2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 net83 A3 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 net79 B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MI11 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 pndB B1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI9 net74 C1 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA1 net87 A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 net83 A3 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 net79 B1 VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 Y A1 VNB nshort m=1 w=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 net74 C1 VNB nshort m=1 w=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 Y B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI10 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a311oi_lp
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.netlist.tsv b/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.netlist.tsv
index 1cbccbb..b7d1147 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.netlist.tsv
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__a311oi_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	net87	A2	net83	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	net83	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	net79	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	net74	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Y	A1	net87	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net74	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	Y	B1	net79	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	net87	A2	net83	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	net83	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	net79	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	net74	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Y	A1	net87	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net74	C1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	Y	B1	net79	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.spice b/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.spice
index 7549724..1056c5f 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.spice
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a311oi_lp A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_134_409# A3 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=5.6e+11p pd=5.12e+06u as=5.85e+11p ps=5.17e+06u
-M1001 a_134_409# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND A3 a_194_47# VNB nshort w=420000u l=150000u
-+  ad=2.373e+11p pd=2.81e+06u as=1.008e+11p ps=1.32e+06u
-M1003 a_194_47# A2 a_116_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1004 Y C1 a_456_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=2.8e+11p ps=2.56e+06u
-M1005 VPWR A2 a_134_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_116_47# A1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.373e+11p ps=2.81e+06u
-M1007 Y B1 a_358_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1008 a_456_409# B1 a_134_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_358_47# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_516_47# C1 Y VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1011 VGND C1 a_516_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_134_409# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_134_409# B1 a_456_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_194_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_516_47# C1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND B1 a_358_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR A1 a_134_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_116_47# A2 a_194_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 Y A1 a_116_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 Y C1 a_516_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR A3 a_134_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 a_358_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_456_409# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_m.cdl b/cells/a311oi/sky130_fd_sc_lp__a311oi_m.cdl
index 93212a8..07b5aa2 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_m.cdl
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a311oi_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=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.42 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=0.42 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=0.42 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=0.42 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.42 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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=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_lp__a311oi_m
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_m.netlist.tsv b/cells/a311oi/sky130_fd_sc_lp__a311oi_m.netlist.tsv
index 6ea415a..d4d9bd2 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_m.netlist.tsv
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a311oi_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	pndB	B1	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	Y	C1	pndB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	pndB	B1	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	Y	C1	pndB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	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/a311oi/sky130_fd_sc_lp__a311oi_m.spice b/cells/a311oi/sky130_fd_sc_lp__a311oi_m.spice
index f8ae8aa..d7dcbb6 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_m.spice
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a311oi_m A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_191_535# A1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=3.99e+11p ps=3.58e+06u
-M1001 a_199_51# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=4.158e+11p ps=3.66e+06u
-M1002 VGND B1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.289e+11p ps=2.77e+06u
-M1003 Y C1 a_449_535# VPB phighvt w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=8.82e+10p ps=1.26e+06u
-M1004 VPWR A2 a_191_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y C1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_191_535# A3 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_449_535# B1 a_191_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_271_51# A2 a_199_51# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1009 Y A1 a_271_51# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_191_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_199_51# A2 a_271_51# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND C1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_191_535# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VPWR A3 a_191_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_449_535# C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND A3 a_199_51# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_271_51# A1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_191_535# B1 a_449_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_0.cdl b/cells/a31o/sky130_fd_sc_lp__a31o_0.cdl
index 313afc2..afae562 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_0.cdl
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a31o_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPA2 pndA A3 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
+MMPB0 y B1 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
+MMIPX X y 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
-MMPA1 pndA A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=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.42 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=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=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.42 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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a31o_0
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_0.netlist.tsv b/cells/a31o/sky130_fd_sc_lp__a31o_0.netlist.tsv
index 02f4ac6..f853bdd 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_0.netlist.tsv
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a31o_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a31o/sky130_fd_sc_lp__a31o_0.spice b/cells/a31o/sky130_fd_sc_lp__a31o_0.spice
index 7b8a319..e688113 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_0.spice
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a31o_0 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 a_361_50# A2 a_272_50# VNB nshort w=420000u l=150000u
-+  ad=1.281e+11p pd=1.45e+06u as=1.239e+11p ps=1.43e+06u
-M1001 a_266_483# A3 VPWR VPB phighvt w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=3.584e+11p ps=3.68e+06u
-M1002 VGND B1 a_86_241# VNB nshort w=420000u l=150000u
-+  ad=3.339e+11p pd=3.27e+06u as=1.638e+11p ps=1.62e+06u
-M1003 a_266_483# A1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR a_86_241# X VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1005 VGND a_86_241# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1006 a_272_50# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_86_241# B1 a_266_483# VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1008 VPWR A2 a_266_483# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_86_241# A1 a_361_50# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_361_50# A1 a_86_241# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_86_241# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 X a_86_241# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND A3 a_272_50# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR A3 a_266_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_266_483# B1 a_86_241# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 X a_86_241# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 a_272_50# A2 a_361_50# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_266_483# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 VPWR A1 a_266_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_1.cdl b/cells/a31o/sky130_fd_sc_lp__a31o_1.cdl
index 8c8ad6e..7d5e964 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_1.cdl
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.26 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.26 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.84 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.84 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.84 l=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a31o_1
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_1.netlist.tsv b/cells/a31o/sky130_fd_sc_lp__a31o_1.netlist.tsv
index e7aecb1..03de6ec 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_1.netlist.tsv
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_1.spice b/cells/a31o/sky130_fd_sc_lp__a31o_1.spice
index cc55021..526faa3 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_1.spice
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a31o_1 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 a_269_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.749e+11p pd=6.27e+06u as=1.2726e+12p ps=7.06e+06u
-M1001 VPWR a_80_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1002 a_269_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=2.016e+11p pd=2.16e+06u as=7.644e+11p ps=5.18e+06u
-M1003 a_347_47# A2 a_269_47# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=0p ps=0u
-M1004 VGND a_80_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1005 a_269_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_80_21# B1 a_269_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1007 a_80_21# A1 a_347_47# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=0p ps=0u
-M1008 VGND B1 a_80_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A2 a_269_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A3 a_269_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR A3 a_269_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_269_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR A1 a_269_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_269_367# B1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_269_47# A2 a_347_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_347_47# A1 a_80_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_80_21# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_2.cdl b/cells/a31o/sky130_fd_sc_lp__a31o_2.cdl
index c9ed6ff..417dee4 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_2.cdl
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.26 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.26 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.84 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.84 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.84 l=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 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_lp__a31o_2
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_2.netlist.tsv b/cells/a31o/sky130_fd_sc_lp__a31o_2.netlist.tsv
index 0c220e6..5a6df19 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_2.netlist.tsv
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_2.spice b/cells/a31o/sky130_fd_sc_lp__a31o_2.spice
index ad8a5eb..1a60dbc 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_2.spice
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a31o_2 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 VGND B1 a_85_23# VNB nshort w=840000u l=150000u
-+  ad=9.66e+11p pd=7.34e+06u as=3.276e+11p ps=2.46e+06u
-M1001 a_342_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=1.5498e+12p ps=1.002e+07u
-M1002 VPWR a_85_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1003 a_342_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_427_49# A2 a_355_49# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=1.764e+11p ps=2.1e+06u
-M1005 VPWR A2 a_342_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_355_49# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_85_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_85_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1009 X a_85_23# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_85_23# B1 a_342_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1011 a_85_23# A1 a_427_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_85_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 X a_85_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_342_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR A1 a_342_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND A3 a_355_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_355_49# A2 a_427_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 X a_85_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_342_367# B1 a_85_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR A3 a_342_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VGND a_85_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_427_49# A1 a_85_23# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_85_23# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_4.cdl b/cells/a31o/sky130_fd_sc_lp__a31o_4.cdl
index 86a01c8..55a1100 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_4.cdl
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 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
-MMPA2 pndA A3 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 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
+MMNA2 sndA2 A3 VNB nfet_01v8 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
+MMNB0 y B1 VNB nfet_01v8 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
-MMPB0 y B1 VPB phighvt m=2 w=1.26 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.26 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.84 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.84 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.84 l=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=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_lp__a31o_4
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_4.netlist.tsv b/cells/a31o/sky130_fd_sc_lp__a31o_4.netlist.tsv
index dd7cf29..1986c3e 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_4.netlist.tsv
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_4.spice b/cells/a31o/sky130_fd_sc_lp__a31o_4.spice
index f751a7b..66b97d2 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_4.spice
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_lp__a31o_4 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 a_726_47# A2 a_919_67# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=6.972e+11p ps=6.7e+06u
-M1001 a_27_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7262e+12p pd=1.534e+07u as=2.1294e+12p ps=1.85e+07u
-M1002 a_919_67# A1 a_110_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1003 VGND a_110_47# X VNB nshort w=840000u l=150000u
-+  ad=1.218e+12p pd=1.13e+07u as=8.876e+11p ps=5.8e+06u
-M1004 VPWR a_110_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1005 a_919_67# A2 a_726_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A3 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_110_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_110_47# B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_726_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_367# B1 a_110_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1012 X a_110_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A2 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_110_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND B1 a_110_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_110_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_110_47# A1 a_919_67# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A1 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND A3 a_726_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_110_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_110_47# B1 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_110_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_726_47# A2 a_919_67# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR a_110_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_27_367# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_110_47# B1 a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND B1 a_110_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_27_367# B1 a_110_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 X a_110_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_919_67# A1 a_110_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 X a_110_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VGND a_110_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_110_47# A1 a_919_67# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_919_67# A2 a_726_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 X a_110_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 VGND A3 a_726_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_726_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 VPWR A1 a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_27_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VPWR A2 a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_110_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 VGND a_110_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 X a_110_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 VPWR A3 a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 VPWR a_110_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_lp.cdl b/cells/a31o/sky130_fd_sc_lp__a31o_lp.cdl
index 1949d7c..8b42ab4 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_lp.cdl
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_lp.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__a31o_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPA2 pndA A3 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
+MMPB0 y B1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIPX X y 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
-MMPA2 pndA A3 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 net82 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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 l=0.25 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 l=0.25 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA1 net82 A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI11 net73 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 y A1 VNB nshort m=1 w=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 net73 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 net62 A3 VNB nfet_01v8 m=1 w=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 net62 A3 VNB nshort m=1 w=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 net58 B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net58 B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a31o_lp
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_lp.netlist.tsv b/cells/a31o/sky130_fd_sc_lp__a31o_lp.netlist.tsv
index ff88be9..8868509 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_lp.netlist.tsv
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_lp.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__a31o_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	net82	A2	net62	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	net58	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	net73	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	y	A1	net82	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net73	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net62	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net58	B1	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	net82	A2	net62	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	net58	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	net73	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	y	A1	net82	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net73	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net62	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net58	B1	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/a31o/sky130_fd_sc_lp__a31o_lp.spice b/cells/a31o/sky130_fd_sc_lp__a31o_lp.spice
index 1dde851..7d5b604 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_lp.spice
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_lp.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a31o_lp A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 VPWR A3 a_155_409# VPB phighvt w=1e+06u l=250000u
-+  ad=5.6e+11p pd=5.12e+06u as=5.6e+11p ps=5.12e+06u
-M1001 a_516_56# a_48_409# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.373e+11p ps=2.81e+06u
-M1002 X a_48_409# a_516_56# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1003 a_155_409# B1 a_48_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1004 a_155_409# A2 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_48_409# B1 a_116_56# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=8.82e+10p ps=1.26e+06u
-M1006 X a_48_409# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1007 a_116_56# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A1 a_155_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_274_56# A1 a_48_409# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1010 a_352_56# A2 a_274_56# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1011 VGND A3 a_352_56# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_352_56# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_155_409# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_48_409# B1 a_155_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_274_56# A2 a_352_56# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_516_56# a_48_409# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_155_409# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 VPWR A2 a_155_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_116_56# B1 a_48_409# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND B1 a_116_56# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_48_409# A1 a_274_56# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND a_48_409# a_516_56# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR a_48_409# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_m.cdl b/cells/a31o/sky130_fd_sc_lp__a31o_m.cdl
index 3281d3b..2787f47 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_m.cdl
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a31o_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=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.42 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=0.42 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=0.42 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.42 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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a31o_m
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_m.netlist.tsv b/cells/a31o/sky130_fd_sc_lp__a31o_m.netlist.tsv
index 5b0053a..a3f632b 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_m.netlist.tsv
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a31o_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a31o/sky130_fd_sc_lp__a31o_m.spice b/cells/a31o/sky130_fd_sc_lp__a31o_m.spice
index ce4737f..86cacc3 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_m.spice
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a31o_m A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 VPWR a_86_172# X VPB phighvt w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=1.113e+11p ps=1.37e+06u
-M1001 a_86_172# A1 a_354_66# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=8.82e+10p ps=1.26e+06u
-M1002 VPWR A2 a_274_512# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1003 a_282_66# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.583e+11p ps=2.91e+06u
-M1004 a_354_66# A2 a_282_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_86_172# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 VGND B1 a_86_172# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_86_172# B1 a_274_512# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1008 a_274_512# A3 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_274_512# A1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_274_512# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_274_512# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 X a_86_172# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_274_512# B1 a_86_172# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_282_66# A2 a_354_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_86_172# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_354_66# A1 a_86_172# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_86_172# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR A3 a_274_512# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VGND A3 a_282_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_0.cdl b/cells/a31oi/sky130_fd_sc_lp__a31oi_0.cdl
index 9c8d7f3..9057f01 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_0.cdl
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_0.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__a31oi_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPA2 pndA A3 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
+MMPB0 Y B1 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
+MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 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
-MMPA2 pndA A3 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
-MMPB0 Y B1 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
-MMNA0 Y A1 VNB nshort m=1 w=0.42 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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=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.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_lp__a31oi_0
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_0.netlist.tsv b/cells/a31oi/sky130_fd_sc_lp__a31oi_0.netlist.tsv
index e7cf359..f2bdb1e 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_0.netlist.tsv
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_0.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__a31oi_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	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/a31oi/sky130_fd_sc_lp__a31oi_0.spice b/cells/a31oi/sky130_fd_sc_lp__a31oi_0.spice
index 2c3dce3..7bf048c 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_0.spice
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_0.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__a31oi_0 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 Y A1 a_201_47# VNB nshort w=420000u l=150000u
-+  ad=1.764e+11p pd=1.68e+06u as=1.008e+11p ps=1.32e+06u
-M1001 VPWR A2 a_110_473# VPB phighvt w=640000u l=150000u
-+  ad=3.488e+11p pd=3.65e+06u as=3.584e+11p ps=3.68e+06u
-M1002 a_123_47# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.226e+11p ps=2.74e+06u
-M1003 VGND B1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B1 a_110_473# VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1005 a_110_473# A3 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_110_473# A1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_201_47# A2 a_123_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A3 a_110_473# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_110_473# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_123_47# A2 a_201_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR A1 a_110_473# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 VGND A3 a_123_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_110_473# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 a_201_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_1.cdl b/cells/a31oi/sky130_fd_sc_lp__a31oi_1.cdl
index 543527a..f1b1d25 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_1.cdl
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.84 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.26 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.26 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.26 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.84 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.84 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.84 l=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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a31oi_1
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_1.netlist.tsv b/cells/a31oi/sky130_fd_sc_lp__a31oi_1.netlist.tsv
index b7f8482..f462a19 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_1.netlist.tsv
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_1.spice b/cells/a31oi/sky130_fd_sc_lp__a31oi_1.spice
index 04f8489..1a8ac58 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_1.spice
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__a31oi_1 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 a_151_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=8.883e+11p ps=6.45e+06u
-M1001 a_151_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=4.494e+11p pd=4.43e+06u as=3.276e+11p ps=2.46e+06u
-M1003 a_151_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1004 Y B1 a_151_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.347e+11p pd=3.21e+06u as=0p ps=0u
-M1005 VPWR A2 a_151_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_223_47# A2 a_151_47# VNB nshort w=840000u l=150000u
-+  ad=3.36e+11p pd=2.48e+06u as=0p ps=0u
-M1007 Y A1 a_223_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A3 a_151_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_151_47# A2 a_223_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_223_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR A1 a_151_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_151_367# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_151_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VPWR A3 a_151_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_2.cdl b/cells/a31oi/sky130_fd_sc_lp__a31oi_2.cdl
index 58639f3..fa15778 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_2.cdl
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.84 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.26 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.26 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.26 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.84 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.84 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.84 l=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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 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
+MMNA2 sndA2 A3 VNB nfet_01v8 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
+MMNB0 Y B1 VNB nfet_01v8 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_lp__a31oi_2
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_2.netlist.tsv b/cells/a31oi/sky130_fd_sc_lp__a31oi_2.netlist.tsv
index f15dc60..e635912 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_2.netlist.tsv
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_2.spice b/cells/a31oi/sky130_fd_sc_lp__a31oi_2.spice
index 26c7c4d..b2541fc 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_2.spice
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__a31oi_2 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 VPWR A2 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.8144e+12p pd=1.044e+07u as=1.7262e+12p ps=1.534e+07u
-M1001 a_27_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_27_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_282_69# A2 a_27_69# VNB nshort w=840000u l=150000u
-+  ad=5.334e+11p pd=4.63e+06u as=6.804e+11p ps=6.66e+06u
-M1004 a_27_367# B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1005 a_27_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=6.846e+11p ps=6.67e+06u
-M1007 a_282_69# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A1 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A3 a_27_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B1 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_69# A2 a_282_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_69# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A3 a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A1 a_282_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR A3 a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VGND A3 a_27_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_27_69# A2 a_282_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_27_367# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_27_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_282_69# A2 a_27_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_27_69# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_27_367# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VPWR A1 a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VPWR A2 a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 Y A1 a_282_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 Y B1 a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_282_69# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_4.cdl b/cells/a31oi/sky130_fd_sc_lp__a31oi_4.cdl
index c77d08a..01f5e7d 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_4.cdl
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 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.84 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.26 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.26 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.26 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.84 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.84 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.84 l=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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.84 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.84 l=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.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_lp__a31oi_4
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_4.netlist.tsv b/cells/a31oi/sky130_fd_sc_lp__a31oi_4.netlist.tsv
index 2aa7444..f54e3b6 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_4.netlist.tsv
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_4.spice b/cells/a31oi/sky130_fd_sc_lp__a31oi_4.spice
index 18f9a80..be820e9 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_4.spice
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_lp__a31oi_4 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 a_41_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.2382e+12p pd=2.782e+07u as=2.7972e+12p ps=1.956e+07u
-M1001 a_454_69# A1 Y VNB nshort w=840000u l=150000u
-+  ad=1.008e+12p pd=9.12e+06u as=1.1508e+12p ps=1.114e+07u
-M1002 Y B1 a_41_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1003 a_41_367# B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A1 a_454_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A2 a_41_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_69# A2 a_454_69# VNB nshort w=840000u l=150000u
-+  ad=1.2852e+12p pd=1.146e+07u as=0p ps=0u
-M1007 a_41_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_41_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_454_69# A2 a_27_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_41_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A3 a_27_69# VNB nshort w=840000u l=150000u
-+  ad=9.408e+11p pd=8.96e+06u as=0p ps=0u
-M1012 VPWR A1 a_41_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B1 a_41_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A1 a_454_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A1 a_41_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_454_69# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_41_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_27_69# A2 a_454_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR A3 a_41_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A3 a_41_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A3 a_27_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_41_367# B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_27_69# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_454_69# A2 a_27_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_27_69# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_41_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR A2 a_41_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A2 a_41_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_454_69# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_41_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 Y A1 a_454_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND A3 a_27_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_27_69# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_41_367# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 Y B1 a_41_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_41_367# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_41_367# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VPWR A3 a_41_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 Y B1 a_41_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_41_367# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VGND A3 a_27_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 Y A1 a_454_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_27_69# A2 a_454_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_41_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_27_69# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 a_454_69# A2 a_27_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 VPWR A3 a_41_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 VPWR A1 a_41_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 a_27_69# A2 a_454_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 a_41_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 VPWR A1 a_41_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 a_41_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 a_454_69# A2 a_27_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X28 a_454_69# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X30 VPWR A2 a_41_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.cdl b/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.cdl
index a1c1e40..7f49840 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.cdl
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.cdl
@@ -16,22 +16,22 @@
 
 .SUBCKT sky130_fd_sc_lp__a31oi_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPA2 pndA A3 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
+MMPB0 Y B1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 net66 A2 VNB nfet_01v8 m=1 w=0.42 l=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.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MI8 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 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
-MMNA1 net66 A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net61 B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 Y A1 VNB nshort m=1 w=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 net61 B1 VNB nshort m=1 w=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 net50 A3 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI11 net50 A3 VNB nfet_01v8 m=1 w=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_lp__a31oi_lp
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.netlist.tsv b/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.netlist.tsv
index 927a948..4d17d56 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.netlist.tsv
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.netlist.tsv
@@ -1,11 +1,11 @@
 sky130_fd_sc_lp__a31oi_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	net66	A2	net50	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	net61	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Y	A1	net66	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net61	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net50	A3	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	net66	A2	net50	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	net61	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Y	A1	net66	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net61	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net50	A3	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/a31oi/sky130_fd_sc_lp__a31oi_lp.spice b/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.spice
index 6a4ce59..7863e87 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.spice
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.spice
@@ -16,22 +16,13 @@
 
 
 .subckt sky130_fd_sc_lp__a31oi_lp A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 VPWR A2 a_139_409# VPB phighvt w=1e+06u l=250000u
-+  ad=6.05e+11p pd=5.21e+06u as=5.6e+11p ps=5.12e+06u
-M1001 a_139_409# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_175_47# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.394e+11p ps=2.82e+06u
-M1003 a_253_47# A2 a_175_47# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1004 Y A1 a_253_47# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1005 a_417_47# B1 Y VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1006 VGND B1 a_417_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_139_409# A3 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B1 a_139_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
+X0 a_175_47# A2 a_253_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_417_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_139_409# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 VGND A3 a_175_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 Y B1 a_417_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR A3 a_139_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_139_409# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_253_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR A1 a_139_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_m.cdl b/cells/a31oi/sky130_fd_sc_lp__a31oi_m.cdl
index 6d7ad6b..94a6aaf 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_m.cdl
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_m.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__a31oi_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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.42 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=0.42 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=0.42 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=0.42 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.42 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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=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.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_lp__a31oi_m
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_m.netlist.tsv b/cells/a31oi/sky130_fd_sc_lp__a31oi_m.netlist.tsv
index b50776c..d64d345 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_m.netlist.tsv
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_m.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__a31oi_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	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/a31oi/sky130_fd_sc_lp__a31oi_m.spice b/cells/a31oi/sky130_fd_sc_lp__a31oi_m.spice
index ef1c29b..ed8a7e03 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_m.spice
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_m.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__a31oi_m A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 a_169_500# A1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=2.289e+11p ps=2.77e+06u
-M1001 Y B1 a_169_500# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1002 VGND B1 Y VNB nshort w=420000u l=150000u
-+  ad=2.226e+11p pd=2.74e+06u as=2.394e+11p ps=1.98e+06u
-M1003 VPWR A2 a_169_500# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_261_82# A2 a_189_82# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=8.82e+10p ps=1.26e+06u
-M1005 Y A1 a_261_82# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_189_82# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_169_500# A3 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_169_500# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_189_82# A2 a_261_82# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR A1 a_169_500# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND A3 a_189_82# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_261_82# A1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR A3 a_169_500# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_169_500# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_0.cdl b/cells/a32o/sky130_fd_sc_lp__a32o_0.cdl
index 2d59b46..e089cdd 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_0.cdl
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_0.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__a32o_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPA2 pndA A3 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
+MMPB0 y B1 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
+MMPB1 y B2 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
+MMIPX X y 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
-MMPA1 pndA A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=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.42 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=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=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=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.42 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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a32o_0
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_0.netlist.tsv b/cells/a32o/sky130_fd_sc_lp__a32o_0.netlist.tsv
index b679e87..c2fbaf8 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_0.netlist.tsv
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_0.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__a32o_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	y	B2	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a32o/sky130_fd_sc_lp__a32o_0.spice b/cells/a32o/sky130_fd_sc_lp__a32o_0.spice
index fd24cff..f86b48d 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_0.spice
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_0.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a32o_0 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 a_363_47# A2 a_275_47# VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=1.218e+11p ps=1.42e+06u
-M1001 a_80_21# B1 a_269_429# VPB phighvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=6.016e+11p ps=5.72e+06u
-M1002 VGND B2 a_563_47# VNB nshort w=420000u l=150000u
-+  ad=4.011e+11p pd=3.59e+06u as=1.638e+11p ps=1.62e+06u
-M1003 VPWR A2 a_269_429# VPB phighvt w=640000u l=150000u
-+  ad=4.192e+11p pd=3.87e+06u as=0p ps=0u
-M1004 a_275_47# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_80_21# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 a_269_429# A3 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_80_21# A1 a_363_47# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1008 a_269_429# B2 a_80_21# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_80_21# X VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1010 a_563_47# B1 a_80_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_269_429# A1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_563_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_269_429# B1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 VGND A3 a_275_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_269_429# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_80_21# B2 a_269_429# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 VPWR A3 a_269_429# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 a_275_47# A2 a_363_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR A1 a_269_429# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X10 a_363_47# A1 a_80_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_80_21# B1 a_563_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_1.cdl b/cells/a32o/sky130_fd_sc_lp__a32o_1.cdl
index 46a3205..521fee9 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_1.cdl
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.26 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.26 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.26 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.84 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.84 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.84 l=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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a32o_1
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_1.netlist.tsv b/cells/a32o/sky130_fd_sc_lp__a32o_1.netlist.tsv
index a42935c..fb48b10 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_1.netlist.tsv
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_1.spice b/cells/a32o/sky130_fd_sc_lp__a32o_1.spice
index a9c79db..b76ec20 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_1.spice
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a32o_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 VPWR A2 a_249_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.3041e+12p pd=7.11e+06u as=1.0395e+12p ps=9.21e+06u
-M1001 a_609_47# B1 a_80_21# VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=5.292e+11p ps=2.94e+06u
-M1002 a_263_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=2.646e+11p pd=2.31e+06u as=7.392e+11p ps=5.12e+06u
-M1003 a_80_21# B1 a_249_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.032e+11p pd=3.16e+06u as=0p ps=0u
-M1004 a_80_21# A1 a_356_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.814e+11p ps=2.35e+06u
-M1005 VPWR a_80_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1006 VGND a_80_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1007 a_356_47# A2 a_263_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_249_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_249_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B2 a_609_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_249_367# B2 a_80_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_249_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_80_21# B2 a_249_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_249_367# B1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR A1 a_249_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_80_21# B1 a_609_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_356_47# A1 a_80_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VPWR A3 a_249_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_609_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_263_47# A2 a_356_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VGND A3 a_263_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_2.cdl b/cells/a32o/sky130_fd_sc_lp__a32o_2.cdl
index f5fd8a7..5c46dd2 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_2.cdl
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 VPB phighvt m=1 w=1.26 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.26 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.26 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.84 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.84 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.84 l=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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 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_lp__a32o_2
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_2.netlist.tsv b/cells/a32o/sky130_fd_sc_lp__a32o_2.netlist.tsv
index 3962eed..160b486 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_2.netlist.tsv
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_2.spice b/cells/a32o/sky130_fd_sc_lp__a32o_2.spice
index d22d055..bf911e3 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_2.spice
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__a32o_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 a_432_47# B2 VGND VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=1.1088e+12p ps=7.68e+06u
-M1001 VGND a_108_267# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1002 a_631_47# A1 a_108_267# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=4.074e+11p ps=2.65e+06u
-M1003 a_345_367# B1 a_108_267# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.3923e+12p pd=9.77e+06u as=3.528e+11p ps=3.08e+06u
-M1004 a_345_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.1592e+12p ps=9.4e+06u
-M1005 VPWR a_108_267# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=6.678e+11p ps=6.1e+06u
-M1006 X a_108_267# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A1 a_345_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_108_267# B2 a_345_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_739_47# A2 a_631_47# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=0p ps=0u
-M1010 a_108_267# B1 a_432_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_108_267# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A3 a_345_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A3 a_739_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_345_367# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR A2 a_345_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_345_367# B2 a_108_267# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_631_47# A2 a_739_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND B2 a_432_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_739_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_432_47# B1 a_108_267# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_345_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_108_267# B1 a_345_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR a_108_267# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 X a_108_267# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VGND a_108_267# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_108_267# A1 a_631_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 X a_108_267# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_4.cdl b/cells/a32o/sky130_fd_sc_lp__a32o_4.cdl
index 49610dd..9ded67a 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_4.cdl
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 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
-MMPA2 pndA A3 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 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
+MMNA2 sndA2 A3 VNB nfet_01v8 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
+MMNB0 y B1 VNB nfet_01v8 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
-MMPB0 y B1 VPB phighvt m=2 w=1.26 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.26 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.26 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.84 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.84 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.84 l=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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 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
+MMINX X y VNB nfet_01v8 m=4 w=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_lp__a32o_4
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_4.netlist.tsv b/cells/a32o/sky130_fd_sc_lp__a32o_4.netlist.tsv
index da01470..57a362d 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_4.netlist.tsv
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_4.spice b/cells/a32o/sky130_fd_sc_lp__a32o_4.spice
index 4708b66..31982b9 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_4.spice
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_lp__a32o_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 VPWR a_101_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.1546e+12p pd=1.854e+07u as=7.056e+11p ps=6.16e+06u
-M1001 a_511_47# A2 a_760_47# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=6.804e+11p ps=6.66e+06u
-M1002 VPWR A3 a_511_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=2.268e+12p ps=1.872e+07u
-M1003 a_511_367# B2 a_101_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=8.064e+11p ps=6.32e+06u
-M1004 X a_101_21# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=1.302e+12p ps=1.15e+07u
-M1005 VGND B2 a_1208_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=6.804e+11p ps=6.66e+06u
-M1006 a_511_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_511_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_760_47# A2 a_511_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_101_21# B1 a_1208_65# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1010 a_511_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_101_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_511_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_101_21# B2 a_511_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_101_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_101_21# A1 a_760_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_101_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_101_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A2 a_511_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_101_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_760_47# A1 a_101_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_101_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1208_65# B2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR A1 a_511_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_101_21# B1 a_511_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_511_367# B1 a_101_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND A3 a_511_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1208_65# B1 a_101_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_511_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_101_21# B1 a_1208_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_511_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_511_47# A2 a_760_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_760_47# A1 a_101_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_1208_65# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR A1 a_511_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 X a_101_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VPWR a_101_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR A3 a_511_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_511_367# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VGND a_101_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 X a_101_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_511_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_101_21# B2 a_511_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_511_367# B2 a_101_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 VPWR A2 a_511_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_760_47# A2 a_511_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 VGND B2 a_1208_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 a_511_367# B1 a_101_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 VGND a_101_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 X a_101_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 a_101_21# B1 a_511_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 a_101_21# A1 a_760_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 a_1208_65# B1 a_101_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 X a_101_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 VGND A3 a_511_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 VPWR a_101_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_lp.cdl b/cells/a32o/sky130_fd_sc_lp__a32o_lp.cdl
index 59d3a5b..1475921 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_lp.cdl
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_lp.cdl
@@ -16,30 +16,30 @@
 
 .SUBCKT sky130_fd_sc_lp__a32o_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPA2 pndA A3 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
+MMPB0 y B1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPB1 y B2 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
-MMPA2 pndA A3 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIPX X y 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
-MMPB0 y B1 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
-MMPB1 y B2 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
-MMIPX X y 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
-MMNA0 y A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 net86 B2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 net86 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI13 net78 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 net78 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI12 net74 A3 VNB nfet_01v8 m=1 w=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 net74 A3 VNB nshort m=1 w=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 net70 A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI11 net70 A2 VNB nfet_01v8 m=1 w=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_lp__a32o_lp
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_lp.netlist.tsv b/cells/a32o/sky130_fd_sc_lp__a32o_lp.netlist.tsv
index 7a4d17b..97b9be1 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_lp.netlist.tsv
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_lp.netlist.tsv
@@ -1,15 +1,15 @@
 sky130_fd_sc_lp__a32o_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	net70	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	net86	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	net86	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	net78	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	net78	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net74	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net70	A2	net74	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	y	B2	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	net70	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	net86	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	net86	B2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	net78	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	net78	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net74	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net70	A2	net74	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_lp.spice b/cells/a32o/sky130_fd_sc_lp__a32o_lp.spice
index 27d4301..82c232d 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_lp.spice
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_lp.spice
@@ -16,30 +16,17 @@
 
 
 .subckt sky130_fd_sc_lp__a32o_lp A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 a_30_419# B1 a_137_419# VPB phighvt w=1e+06u l=250000u
-+  ad=8.45e+11p pd=7.69e+06u as=2.8e+11p ps=2.56e+06u
-M1001 a_137_141# B2 VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.192e+11p ps=3.2e+06u
-M1002 X a_137_419# a_682_141# VNB nshort w=420000u l=150000u
-+  ad=1.575e+11p pd=1.59e+06u as=1.008e+11p ps=1.32e+06u
-M1003 VPWR A3 a_30_419# VPB phighvt w=1e+06u l=250000u
-+  ad=1.125e+12p pd=6.25e+06u as=0p ps=0u
-M1004 X a_137_419# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1005 a_682_141# a_137_419# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_137_419# B2 a_30_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A1 a_30_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_329_141# A1 a_137_419# VNB nshort w=420000u l=150000u
-+  ad=1.764e+11p pd=1.68e+06u as=1.764e+11p ps=1.68e+06u
-M1009 VGND A3 a_443_141# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=1.68e+06u
-M1010 a_137_419# B1 a_137_141# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_443_141# A2 a_329_141# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_30_419# A2 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A2 a_30_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_329_141# A2 a_443_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_443_141# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_30_419# B2 a_137_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 VGND a_137_419# a_682_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_30_419# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 VPWR a_137_419# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_30_419# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_682_141# a_137_419# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_137_141# B1 a_137_419# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_137_419# B1 a_30_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 a_137_419# A1 a_329_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND B2 a_137_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_m.cdl b/cells/a32o/sky130_fd_sc_lp__a32o_m.cdl
index 88b9d99..6b8b604 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_m.cdl
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_m.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__a32o_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=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.42 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=0.42 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=0.42 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=0.42 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.42 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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 sndB1 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a32o_m
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_m.netlist.tsv b/cells/a32o/sky130_fd_sc_lp__a32o_m.netlist.tsv
index 23b0f7d..22ab148 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_m.netlist.tsv
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_m.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__a32o_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	y	B2	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	sndB1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	y	B2	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	sndB1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a32o/sky130_fd_sc_lp__a32o_m.spice b/cells/a32o/sky130_fd_sc_lp__a32o_m.spice
index 02015ab..3784977 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_m.spice
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_m.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a32o_m A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 a_300_47# A2 a_228_47# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VGND a_84_153# X VNB nshort w=420000u l=150000u
-+  ad=2.751e+11p pd=2.99e+06u as=1.197e+11p ps=1.41e+06u
-M1002 a_84_153# B1 a_228_385# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=3.549e+11p ps=4.21e+06u
-M1003 a_228_47# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_228_385# A3 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.688e+11p ps=2.96e+06u
-M1005 a_228_385# A1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_84_153# X VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 a_84_153# A1 a_300_47# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1008 a_228_385# B2 a_84_153# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_516_47# B1 a_84_153# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1010 VGND B2 a_516_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A2 a_228_385# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_84_153# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_228_47# A2 a_300_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_84_153# B2 a_228_385# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_516_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 X a_84_153# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VPWR A3 a_228_385# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_300_47# A1 a_84_153# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_84_153# B1 a_516_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_228_385# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VGND A3 a_228_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_228_385# B1 a_84_153# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 VPWR A1 a_228_385# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_0.cdl b/cells/a32oi/sky130_fd_sc_lp__a32oi_0.cdl
index f82b067..3ae646c 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_0.cdl
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a32oi_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPA2 pndA A3 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
+MMPB0 Y B1 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
+MMPB1 Y B2 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
+MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=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.42 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=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=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=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.42 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.42 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.42 l=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.42 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.42 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.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_lp__a32oi_0
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_0.netlist.tsv b/cells/a32oi/sky130_fd_sc_lp__a32oi_0.netlist.tsv
index c8d1429..ec412c2 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_0.netlist.tsv
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a32oi_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	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/a32oi/sky130_fd_sc_lp__a32oi_0.spice b/cells/a32oi/sky130_fd_sc_lp__a32oi_0.spice
index 10b30c1..52dfcbb 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_0.spice
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a32oi_0 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 VPWR A3 a_37_397# VPB phighvt w=640000u l=150000u
-+  ad=5.664e+11p pd=4.33e+06u as=5.28e+11p ps=5.49e+06u
-M1001 Y B2 a_37_397# VPB phighvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1002 Y B1 a_141_47# VNB nshort w=420000u l=150000u
-+  ad=1.764e+11p pd=1.68e+06u as=1.008e+11p ps=1.32e+06u
-M1003 VPWR A1 a_37_397# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_447_47# A2 a_333_47# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=1.764e+11p ps=1.68e+06u
-M1005 a_141_47# B2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.499e+11p ps=2.87e+06u
-M1006 a_37_397# A2 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A3 a_447_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_37_397# B1 Y VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_333_47# A1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 a_37_397# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 VPWR A2 a_37_397# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_37_397# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 Y A1 a_333_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND B2 a_141_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_37_397# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 a_37_397# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 a_333_47# A2 a_447_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_141_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_447_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_1.cdl b/cells/a32oi/sky130_fd_sc_lp__a32oi_1.cdl
index 48b6cdd..832f0f6 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_1.cdl
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=1.26 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.26 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.26 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.84 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.84 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.84 l=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.84 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.84 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.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_lp__a32oi_1
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_1.netlist.tsv b/cells/a32oi/sky130_fd_sc_lp__a32oi_1.netlist.tsv
index 5d6a2eb..5458dcd 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_1.netlist.tsv
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_1.spice b/cells/a32oi/sky130_fd_sc_lp__a32oi_1.spice
index cc13d02..58d6bb2 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_1.spice
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a32oi_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 Y B2 a_58_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=1.1214e+12p ps=9.34e+06u
-M1001 a_326_69# A1 Y VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=3.36e+11p ps=2.48e+06u
-M1002 a_58_367# B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A3 a_58_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.1151e+12p pd=6.81e+06u as=0p ps=0u
-M1004 Y B1 a_141_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=1.89e+11p ps=2.13e+06u
-M1005 VPWR A1 a_58_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_141_69# B2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.452e+11p ps=4.42e+06u
-M1007 a_58_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_434_69# A2 a_326_69# VNB nshort w=840000u l=150000u
-+  ad=3.696e+11p pd=2.56e+06u as=0p ps=0u
-M1009 VGND A3 a_434_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_326_69# A2 a_434_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_58_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 Y A1 a_326_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 Y B1 a_58_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND B2 a_141_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_58_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_58_367# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VPWR A2 a_58_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_141_69# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_434_69# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_2.cdl b/cells/a32oi/sky130_fd_sc_lp__a32oi_2.cdl
index 3ae187e..23d422b 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_2.cdl
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 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
+MMNA2 sndA2 A3 VNB nfet_01v8 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
+MMNB0 Y B1 VNB nfet_01v8 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
-MMPA2 pndA A3 VPB phighvt m=2 w=1.26 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.26 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.26 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.84 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.84 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.84 l=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.84 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.84 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.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_lp__a32oi_2
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_2.netlist.tsv b/cells/a32oi/sky130_fd_sc_lp__a32oi_2.netlist.tsv
index 26b6b20..787e602 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_2.netlist.tsv
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_2.spice b/cells/a32oi/sky130_fd_sc_lp__a32oi_2.spice
index f0da4d3..2c225a0 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_2.spice
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__a32oi_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_43_367# B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.4759e+12p pd=1.905e+07u as=7.056e+11p ps=6.16e+06u
-M1001 a_43_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=2.0853e+12p ps=1.087e+07u
-M1002 a_43_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y B1 a_43_65# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=7.392e+11p ps=6.8e+06u
-M1004 a_778_65# A2 a_509_65# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=7.98e+11p ps=6.94e+06u
-M1005 Y B2 a_43_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A3 a_778_65# VNB nshort w=840000u l=150000u
-+  ad=6.804e+11p pd=6.66e+06u as=0p ps=0u
-M1007 Y A1 a_509_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B1 a_43_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_43_65# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_509_65# A2 a_778_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_43_367# B2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND B2 a_43_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_43_65# B2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A3 a_43_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_509_65# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_43_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_778_65# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A2 a_43_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A1 a_43_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_43_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND B2 a_43_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_509_65# A2 a_778_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_778_65# A2 a_509_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR A3 a_43_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_43_65# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_43_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_43_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 Y B1 a_43_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_43_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_43_367# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 Y B2 a_43_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VGND A3 a_778_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_43_65# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 Y B1 a_43_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_43_367# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 VPWR A2 a_43_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_509_65# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_778_65# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 Y A1 a_509_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_4.cdl b/cells/a32oi/sky130_fd_sc_lp__a32oi_4.cdl
index eb88a3b..ae6c4d6 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_4.cdl
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.84 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.84 l=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.84 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.26 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.26 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.26 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.84 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.84 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.84 l=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.84 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.84 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.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_lp__a32oi_4
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_4.netlist.tsv b/cells/a32oi/sky130_fd_sc_lp__a32oi_4.netlist.tsv
index 4a1ef94..7b9b68d 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_4.netlist.tsv
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_4.spice b/cells/a32oi/sky130_fd_sc_lp__a32oi_4.spice
index fa4873b..0adf3a8 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_4.spice
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__a32oi_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 VPWR A3 a_42_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.9988e+12p pd=1.988e+07u as=3.9816e+12p ps=3.404e+07u
-M1001 Y B1 a_42_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=0p ps=0u
-M1002 VGND B2 a_28_47# VNB nshort w=840000u l=150000u
-+  ad=1.1508e+12p pd=1.114e+07u as=1.1508e+12p ps=1.114e+07u
-M1003 VPWR A1 a_42_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_42_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A1 a_840_47# VNB nshort w=840000u l=150000u
-+  ad=9.408e+11p pd=8.96e+06u as=1.1508e+12p ps=1.114e+07u
-M1006 a_42_367# B2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_42_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A3 a_1267_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=9.408e+11p ps=8.96e+06u
-M1009 a_840_47# A2 a_1267_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B1 a_28_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A3 a_1267_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_42_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_28_47# B2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_840_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_42_367# B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_28_47# B2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A2 a_42_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_42_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_42_367# B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y B2 a_42_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y B2 a_42_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A2 a_42_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_28_47# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y B1 a_28_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND B2 a_28_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR A3 a_42_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_840_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1267_47# A2 a_840_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_42_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_840_47# A2 a_1267_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1267_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_42_367# B2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y B1 a_42_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_42_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1267_47# A2 a_840_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1267_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Y A1 a_840_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_28_47# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR A1 a_42_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 a_42_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_840_47# A2 a_1267_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_42_367# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_1267_47# A2 a_840_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_42_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 Y A1 a_840_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_42_367# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_42_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR A2 a_42_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_840_47# A2 a_1267_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VGND A3 a_1267_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_1267_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_42_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 Y B2 a_42_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VGND B2 a_28_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_28_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 VPWR A2 a_42_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 VPWR A1 a_42_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 a_42_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_42_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 a_28_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 Y B1 a_28_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 a_42_367# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 Y B1 a_42_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 VGND A3 a_1267_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 Y B2 a_42_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 a_840_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 Y A1 a_840_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X28 a_1267_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 a_42_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 VPWR A3 a_42_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 VPWR A3 a_42_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X32 VGND B2 a_28_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X33 a_840_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X34 VPWR A1 a_42_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X35 a_42_367# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X36 a_28_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X37 a_1267_47# A2 a_840_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X38 a_28_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X39 Y B1 a_28_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.cdl b/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.cdl
index 2de6f43..a5b5dde 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.cdl
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a32oi_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPA2 pndA A3 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
+MMPB0 Y B1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPB1 Y B2 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
-MMPA2 pndA A3 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 Y B1 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
-MMPB1 Y B2 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
-MMNA0 Y A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 Y B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 net67 B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI12 net63 A3 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 net67 B2 VNB nshort m=1 w=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 net63 A3 VNB nshort m=1 w=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 net59 A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI11 net59 A2 VNB nfet_01v8 m=1 w=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_lp__a32oi_lp
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.netlist.tsv b/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.netlist.tsv
index 6ad022f..a8bd4d9 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.netlist.tsv
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a32oi_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	net59	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	net67	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	net67	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net63	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net59	A2	net63	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	net59	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	net67	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	net67	B2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net63	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net59	A2	net63	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.spice b/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.spice
index 325a3f1..7aa2057 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.spice
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a32oi_lp A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_56_409# B1 Y VPB phighvt w=1e+06u l=250000u
-+  ad=8.45e+11p pd=7.69e+06u as=2.8e+11p ps=2.56e+06u
-M1001 a_357_47# A1 Y VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=2.289e+11p ps=1.93e+06u
-M1002 a_56_409# A2 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=5.65e+11p ps=5.13e+06u
-M1003 VGND A3 a_465_47# VNB nshort w=420000u l=150000u
-+  ad=2.394e+11p pd=2.82e+06u as=1.008e+11p ps=1.32e+06u
-M1004 a_465_47# A2 a_357_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y B2 a_56_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B1 a_140_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1007 VPWR A1 a_56_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_140_47# B2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A3 a_56_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_56_409# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 VPWR A2 a_56_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_56_409# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_465_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 Y B1 a_56_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 VGND B2 a_140_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 Y A1 a_357_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_56_409# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_357_47# A2 a_465_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_140_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_m.cdl b/cells/a32oi/sky130_fd_sc_lp__a32oi_m.cdl
index dfa3ef5..0d0bb86 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_m.cdl
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a32oi_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=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.42 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=0.42 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=0.42 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=0.42 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.42 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.42 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.42 l=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.42 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.42 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.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_lp__a32oi_m
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_m.netlist.tsv b/cells/a32oi/sky130_fd_sc_lp__a32oi_m.netlist.tsv
index b5552e4..0c0daed 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_m.netlist.tsv
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a32oi_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	Y	B2	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	sndB1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	sndB1	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	Y	B2	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	sndB1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	sndB1	B2	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/a32oi/sky130_fd_sc_lp__a32oi_m.spice b/cells/a32oi/sky130_fd_sc_lp__a32oi_m.spice
index 777c304..2a2ac1a 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_m.spice
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a32oi_m A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 Y B2 a_40_500# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=4.137e+11p ps=4.49e+06u
-M1001 a_319_47# A1 Y VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=1.365e+11p ps=1.49e+06u
-M1002 a_40_500# B1 Y VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A1 a_40_500# VPB phighvt w=420000u l=150000u
-+  ad=2.625e+11p pd=2.93e+06u as=0p ps=0u
-M1004 a_40_500# A2 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_427_47# A2 a_319_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1006 VGND A3 a_427_47# VNB nshort w=420000u l=150000u
-+  ad=2.982e+11p pd=3.1e+06u as=0p ps=0u
-M1007 Y B1 a_152_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1008 VPWR A3 a_40_500# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_152_47# B2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_40_500# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 Y B1 a_40_500# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 Y A1 a_319_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_319_47# A2 a_427_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_40_500# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_40_500# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VGND B2 a_152_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR A2 a_40_500# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_152_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_427_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_0.cdl b/cells/a41o/sky130_fd_sc_lp__a41o_0.cdl
index da5fcc4..c8e04d3 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_0.cdl
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_0.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__a41o_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPA2 pndA A3 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
+MMPA3 pndA A4 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
+MMPB0 y B1 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
+MMIPX X y 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
-MMPA1 pndA A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 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.42 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.42 l=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.42 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=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=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=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.42 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.42 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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a41o_0
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_0.netlist.tsv b/cells/a41o/sky130_fd_sc_lp__a41o_0.netlist.tsv
index d03bbeb..a6a4639 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_0.netlist.tsv
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_0.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__a41o_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	sndA3	A4	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	pndA	A4	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	sndA3	A4	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a41o/sky130_fd_sc_lp__a41o_0.spice b/cells/a41o/sky130_fd_sc_lp__a41o_0.spice
index 46636a9..2fb9cb0 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_0.spice
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_0.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a41o_0 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 a_321_473# A2 VPWR VPB phighvt w=640000u l=150000u
-+  ad=5.28e+11p pd=5.49e+06u as=5.44e+11p ps=5.54e+06u
-M1001 VPWR a_80_309# X VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1002 VGND a_80_309# X VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=1.113e+11p ps=1.37e+06u
-M1003 a_565_47# A3 a_477_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.218e+11p ps=1.42e+06u
-M1004 VGND A4 a_565_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A1 a_321_473# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_80_309# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.604e+11p pd=2.08e+06u as=0p ps=0u
-M1007 a_477_47# A2 a_385_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1008 a_321_473# B1 a_80_309# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1009 VPWR A3 a_321_473# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_321_473# A4 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_385_47# A1 a_80_309# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_565_47# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_80_309# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 X a_80_309# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND B1 a_80_309# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_321_473# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_80_309# B1 a_321_473# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 VPWR A4 a_321_473# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 a_321_473# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 a_477_47# A3 a_565_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR A2 a_321_473# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X10 a_80_309# A1 a_385_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_385_47# A2 a_477_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_1.cdl b/cells/a41o/sky130_fd_sc_lp__a41o_1.cdl
index bef51dc..1b1a05a 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_1.cdl
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA3 sndA3 A4 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA3 pndA A4 VPB phighvt m=1 w=1.26 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.26 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.26 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.84 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.84 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.84 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.84 l=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a41o_1
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_1.netlist.tsv b/cells/a41o/sky130_fd_sc_lp__a41o_1.netlist.tsv
index 8fbf66b..a9c8448 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_1.netlist.tsv
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	sndA3	A4	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	sndA3	A4	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_1.spice b/cells/a41o/sky130_fd_sc_lp__a41o_1.spice
index deb7d4b..5775ff8 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_1.spice
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a41o_1 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 a_550_47# A2 a_478_47# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=1.764e+11p ps=2.1e+06u
-M1001 VGND a_113_237# X VNB nshort w=840000u l=150000u
-+  ad=8.736e+11p pd=5.44e+06u as=2.226e+11p ps=2.21e+06u
-M1002 a_478_47# A1 a_113_237# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=2.8e+06u
-M1003 a_346_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0395e+12p pd=9.21e+06u as=1.5183e+12p ps=9.97e+06u
-M1004 a_658_47# A3 a_550_47# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=0p ps=0u
-M1005 VPWR A1 a_346_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_346_367# A4 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A4 a_658_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_113_237# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1009 VPWR A3 a_346_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_113_237# B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_346_367# B1 a_113_237# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 a_478_47# A2 a_550_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_346_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 X a_113_237# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 X a_113_237# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR A4 a_346_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND B1 a_113_237# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR A2 a_346_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_550_47# A3 a_658_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_658_47# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_346_367# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_113_237# A1 a_478_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_113_237# B1 a_346_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_2.cdl b/cells/a41o/sky130_fd_sc_lp__a41o_2.cdl
index 53787e1..4f9bbeb 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_2.cdl
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA3 sndA3 A4 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA3 pndA A4 VPB phighvt m=1 w=1.26 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.26 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.26 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.84 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.84 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.84 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.84 l=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 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_lp__a41o_2
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_2.netlist.tsv b/cells/a41o/sky130_fd_sc_lp__a41o_2.netlist.tsv
index 1592118..437ab9e 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_2.netlist.tsv
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	sndA3	A4	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	sndA3	A4	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_2.spice b/cells/a41o/sky130_fd_sc_lp__a41o_2.spice
index 5bbd865..b0c7a00 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_2.spice
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__a41o_2 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 VPWR A2 a_453_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4238e+12p pd=1.234e+07u as=1.3167e+12p ps=9.65e+06u
-M1001 VPWR A4 a_453_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND B1 a_90_53# VNB nshort w=840000u l=150000u
-+  ad=7.728e+11p pd=6.88e+06u as=4.452e+11p ps=4.42e+06u
-M1003 a_90_53# A1 a_741_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=3.276e+11p ps=2.46e+06u
-M1004 VPWR a_90_53# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1005 a_453_367# B1 a_90_53# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1006 a_561_49# A4 VGND VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1007 a_633_49# A3 a_561_49# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=0p ps=0u
-M1008 X a_90_53# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1009 a_741_49# A2 a_633_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_453_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_90_53# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_453_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_90_53# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_90_53# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR A1 a_453_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_453_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR a_90_53# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_561_49# A3 a_633_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND a_90_53# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_633_49# A2 a_741_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_90_53# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND A4 a_561_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_741_49# A1 a_90_53# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VPWR A3 a_453_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_90_53# B1 a_453_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_453_367# A4 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 X a_90_53# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_4.cdl b/cells/a41o/sky130_fd_sc_lp__a41o_4.cdl
index 41a8fe4..4de2d21 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_4.cdl
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 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
-MMPA2 pndA A3 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 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
+MMNA2 sndA2 A3 VNB nfet_01v8 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
+MMNA3 sndA3 A4 VNB nfet_01v8 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
+MMNB0 y B1 VNB nfet_01v8 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
-MMPA3 pndA A4 VPB phighvt m=2 w=1.26 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.26 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.26 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.84 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.84 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.84 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.84 l=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=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_lp__a41o_4
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_4.netlist.tsv b/cells/a41o/sky130_fd_sc_lp__a41o_4.netlist.tsv
index a7c1351..e3a38b4 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_4.netlist.tsv
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	sndA3	A4	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	sndA3	A4	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_4.spice b/cells/a41o/sky130_fd_sc_lp__a41o_4.spice
index 9347556..54b65c2 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_4.spice
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_lp__a41o_4 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 X a_100_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=2.4885e+12p ps=2.159e+07u
-M1001 a_495_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.079e+12p pd=1.842e+07u as=0p ps=0u
-M1002 VGND a_100_23# X VNB nshort w=840000u l=150000u
-+  ad=1.1508e+12p pd=1.114e+07u as=4.704e+11p ps=4.48e+06u
-M1003 a_667_47# A2 a_922_47# VNB nshort w=840000u l=150000u
-+  ad=6.804e+11p pd=6.66e+06u as=4.704e+11p ps=4.48e+06u
-M1004 VGND a_100_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_495_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_100_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_100_23# B1 a_495_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1008 VPWR A2 a_495_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1115_47# A4 VGND VNB nshort w=840000u l=150000u
-+  ad=6.804e+11p pd=6.66e+06u as=0p ps=0u
-M1010 a_495_367# A4 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1115_47# A3 a_922_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A1 a_495_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_100_23# B1 VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1014 VPWR A3 a_495_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_100_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_100_23# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_667_47# A1 a_100_23# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_922_47# A2 a_667_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A4 a_1115_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_100_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR A4 a_495_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND B1 a_100_23# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_495_367# B1 a_100_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_100_23# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_100_23# A1 a_667_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_922_47# A3 a_1115_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_495_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_100_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR a_100_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR A4 a_495_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_667_47# A2 a_922_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR A1 a_495_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_495_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VPWR a_100_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_667_47# A1 a_100_23# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 X a_100_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VGND a_100_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_922_47# A2 a_667_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_1115_47# A3 a_922_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VPWR A3 a_495_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_922_47# A3 a_1115_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_495_367# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VPWR A2 a_495_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_1115_47# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_100_23# A1 a_667_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_495_367# B1 a_100_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VGND a_100_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 X a_100_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 X a_100_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 VGND B1 a_100_23# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_100_23# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 a_495_367# A4 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 VGND A4 a_1115_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 a_100_23# B1 a_495_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 a_495_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_lp.cdl b/cells/a41o/sky130_fd_sc_lp__a41o_lp.cdl
index 8b6e321..5b495b5 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_lp.cdl
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_lp.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__a41o_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPA2 pndA A3 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
+MMPA3 pndA A4 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
+MMPB0 y B1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIPX X y 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
-MMPA2 pndA A3 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 net95 A2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA3 net91 A4 VNB nfet_01v8 m=1 w=0.42 l=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.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 y B1 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
-MMIPX X y 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
-MMNA1 net95 A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI12 net94 A3 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA3 net91 A4 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI13 net75 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=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 net94 A3 VNB nshort m=1 w=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 net75 y VNB nshort m=1 w=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 y A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI8 net86 B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net86 B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a41o_lp
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_lp.netlist.tsv b/cells/a41o/sky130_fd_sc_lp__a41o_lp.netlist.tsv
index 4804df4..1352977 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_lp.netlist.tsv
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_lp.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__a41o_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	net95	A2	net94	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	net91	A4	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	net86	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	net75	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net94	A3	net91	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	net75	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	y	A1	net95	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net86	B1	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	pndA	A4	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	net95	A2	net94	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	net91	A4	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	net86	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	net75	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net94	A3	net91	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	net75	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	y	A1	net95	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net86	B1	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/a41o/sky130_fd_sc_lp__a41o_lp.spice b/cells/a41o/sky130_fd_sc_lp__a41o_lp.spice
index 830aa35..63522a3 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_lp.spice
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_lp.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__a41o_lp A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 a_428_47# A1 a_314_47# VNB nshort w=420000u l=150000u
-+  ad=1.764e+11p pd=1.68e+06u as=1.764e+11p ps=1.68e+06u
-M1001 VPWR A2 a_27_409# VPB phighvt w=1e+06u l=250000u
-+  ad=8.65e+11p pd=7.73e+06u as=8.45e+11p ps=7.69e+06u
-M1002 VPWR A4 a_27_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_428_47# B1 a_27_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1004 VGND B1 a_542_47# VNB nshort w=420000u l=150000u
-+  ad=2.373e+11p pd=2.81e+06u as=8.82e+10p ps=1.26e+06u
-M1005 a_206_47# A3 a_128_47# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=1.008e+11p ps=1.32e+06u
-M1006 a_27_409# A3 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_314_47# A2 a_206_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_542_47# B1 a_428_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_700_47# a_428_47# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1010 a_128_47# A4 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_428_47# a_700_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1012 a_27_409# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_428_47# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
+X0 a_314_47# A1 a_428_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR A3 a_27_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 VPWR A1 a_27_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_27_409# A4 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_700_47# a_428_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_27_409# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_128_47# A3 a_206_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_428_47# B1 a_542_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND A4 a_128_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_206_47# A2 a_314_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_542_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR a_428_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 VGND a_428_47# a_700_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_27_409# B1 a_428_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_m.cdl b/cells/a41o/sky130_fd_sc_lp__a41o_m.cdl
index 88fc0ac..39f018c 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_m.cdl
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_m.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__a41o_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 pndA A3 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 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.42 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.42 l=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.42 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=0.42 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=0.42 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=0.42 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.42 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.42 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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a41o_m
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_m.netlist.tsv b/cells/a41o/sky130_fd_sc_lp__a41o_m.netlist.tsv
index 4672812..885f331 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_m.netlist.tsv
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_m.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__a41o_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	y	B1	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	sndA3	A4	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	pndA	A4	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	y	B1	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	sndA3	A4	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/a41o/sky130_fd_sc_lp__a41o_m.spice b/cells/a41o/sky130_fd_sc_lp__a41o_m.spice
index f40a80e..98a603b 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_m.spice
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_m.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__a41o_m A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 VPWR A1 a_300_508# VPB phighvt w=420000u l=150000u
-+  ad=3.465e+11p pd=4.17e+06u as=3.465e+11p ps=4.17e+06u
-M1001 a_335_47# A1 a_80_153# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=1.407e+11p ps=1.51e+06u
-M1002 a_300_508# B1 a_80_153# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1003 VPWR A3 a_300_508# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_80_153# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.289e+11p ps=2.77e+06u
-M1005 VGND A4 a_551_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1006 a_443_47# A2 a_335_47# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1007 a_300_508# A2 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_551_47# A3 a_443_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_80_153# X VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1010 VGND a_80_153# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1011 a_300_508# A4 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B1 a_80_153# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_300_508# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_80_153# B1 a_300_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 X a_80_153# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VPWR A2 a_300_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_300_508# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VPWR A4 a_300_508# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_80_153# A1 a_335_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_335_47# A2 a_443_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 X a_80_153# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_443_47# A3 a_551_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_551_47# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_0.cdl b/cells/a41oi/sky130_fd_sc_lp__a41oi_0.cdl
index e748010..72d09f0 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_0.cdl
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a41oi_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPA2 pndA A3 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
+MMPA3 pndA A4 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
+MMPB0 Y B1 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
+MMNA0 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 pndA A2 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
-MMPA2 pndA A3 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
-MMPA3 pndA A4 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
-MMPB0 Y B1 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
-MMNA0 Y A1 VNB nshort m=1 w=0.42 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.42 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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 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.42 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.42 l=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.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_lp__a41oi_0
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_0.netlist.tsv b/cells/a41oi/sky130_fd_sc_lp__a41oi_0.netlist.tsv
index bbed87a..55a7195 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_0.netlist.tsv
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a41oi_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	sndA3	A4	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	pndA	A4	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	sndA3	A4	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	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/a41oi/sky130_fd_sc_lp__a41oi_0.spice b/cells/a41oi/sky130_fd_sc_lp__a41oi_0.spice
index 1d62915..2a0a0c2 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_0.spice
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a41oi_0 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 VPWR A3 a_176_479# VPB phighvt w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=5.28e+11p ps=5.49e+06u
-M1001 a_176_479# B1 Y VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1002 a_176_479# A4 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_434_47# A3 a_320_47# VNB nshort w=420000u l=150000u
-+  ad=1.764e+11p pd=1.68e+06u as=1.764e+11p ps=1.68e+06u
-M1004 a_176_479# A2 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_320_47# A2 a_230_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1006 Y B1 VGND VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=2.226e+11p ps=2.74e+06u
-M1007 a_230_47# A1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A4 a_434_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A1 a_176_479# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 a_176_479# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 VPWR A2 a_176_479# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 Y A1 a_230_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_176_479# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 VPWR A4 a_176_479# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_320_47# A3 a_434_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_176_479# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_230_47# A2 a_320_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_434_47# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_1.cdl b/cells/a41oi/sky130_fd_sc_lp__a41oi_1.cdl
index 659fc51..05a10e9 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_1.cdl
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 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.26 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.26 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.26 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.84 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.84 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.84 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.84 l=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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 sndA2 A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA3 sndA3 A4 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a41oi_1
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_1.netlist.tsv b/cells/a41oi/sky130_fd_sc_lp__a41oi_1.netlist.tsv
index 7c270ef..2cbea8d 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_1.netlist.tsv
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	sndA3	A4	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	sndA3	A4	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_1.spice b/cells/a41oi/sky130_fd_sc_lp__a41oi_1.spice
index 82e57bf..b4b6ada 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_1.spice
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a41oi_1 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 a_128_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.1088e+12p pd=9.32e+06u as=1.3923e+12p ps=7.25e+06u
-M1001 a_128_367# B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1002 a_390_47# A3 a_304_47# VNB nshort w=840000u l=150000u
-+  ad=3.528e+11p pd=2.52e+06u as=2.352e+11p ps=2.24e+06u
-M1003 Y A1 a_504_47# VNB nshort w=840000u l=150000u
-+  ad=4.452e+11p pd=4.42e+06u as=2.436e+11p ps=2.26e+06u
-M1004 VPWR A4 a_128_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_128_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_504_47# A2 a_390_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=6.132e+11p pd=3.14e+06u as=0p ps=0u
-M1008 VPWR A2 a_128_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_304_47# A4 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_128_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR A3 a_128_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_390_47# A2 a_504_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_128_367# A4 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 Y B1 a_128_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_504_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VGND A4 a_304_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VPWR A1 a_128_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_304_47# A3 a_390_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_2.cdl b/cells/a41oi/sky130_fd_sc_lp__a41oi_2.cdl
index b65ad7b..6159e71 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_2.cdl
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 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.26 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.26 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.26 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.84 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.84 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.84 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.84 l=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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 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
+MMNA2 sndA2 A3 VNB nfet_01v8 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
+MMNA3 sndA3 A4 VNB nfet_01v8 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
+MMNB0 Y B1 VNB nfet_01v8 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_lp__a41oi_2
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_2.netlist.tsv b/cells/a41oi/sky130_fd_sc_lp__a41oi_2.netlist.tsv
index d3d71d1..a25032c 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_2.netlist.tsv
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	sndA3	A4	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	sndA3	A4	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_2.spice b/cells/a41oi/sky130_fd_sc_lp__a41oi_2.spice
index ff68d16..7877f8a 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_2.spice
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__a41oi_2 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 a_103_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.079e+12p pd=1.842e+07u as=2.5641e+12p ps=1.415e+07u
-M1001 a_103_367# B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1002 a_318_69# A2 a_577_69# VNB nshort w=840000u l=150000u
-+  ad=7.56e+11p pd=6.84e+06u as=4.704e+11p ps=4.48e+06u
-M1003 VPWR A4 a_103_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_318_69# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1005 a_788_69# A3 a_577_69# VNB nshort w=840000u l=150000u
-+  ad=7.392e+11p pd=6.8e+06u as=0p ps=0u
-M1006 VPWR A3 a_103_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B1 a_103_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_103_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A4 a_788_69# VNB nshort w=840000u l=150000u
-+  ad=6.804e+11p pd=6.66e+06u as=0p ps=0u
-M1010 VPWR A2 a_103_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_103_367# A4 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_577_69# A2 a_318_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A1 a_103_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A1 a_318_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_577_69# A3 a_788_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_103_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_788_69# A4 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_318_69# A2 a_577_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_577_69# A2 a_318_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR A4 a_103_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR A2 a_103_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR A3 a_103_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_788_69# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR A1 a_103_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VGND A4 a_788_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_103_367# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_103_367# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_788_69# A3 a_577_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_577_69# A3 a_788_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_103_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_103_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 Y B1 a_103_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_318_69# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 Y A1 a_318_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 a_103_367# A4 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_4.cdl b/cells/a41oi/sky130_fd_sc_lp__a41oi_4.cdl
index e38f079..6e913ab 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_4.cdl
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 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.26 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.26 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.26 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.84 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.84 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.84 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.84 l=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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=4 w=0.84 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.84 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.84 l=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.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_lp__a41oi_4
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_4.netlist.tsv b/cells/a41oi/sky130_fd_sc_lp__a41oi_4.netlist.tsv
index 1c71446..7b28357 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_4.netlist.tsv
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	sndA3	A4	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	sndA3	A4	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_4.spice b/cells/a41oi/sky130_fd_sc_lp__a41oi_4.spice
index 1f80199..3dffb11 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_4.spice
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__a41oi_4 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 a_30_367# A4 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.843e+12p pd=3.382e+07u as=4.2462e+12p ps=2.69e+07u
-M1001 a_30_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR A1 a_30_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_30_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_478_65# A1 Y VNB nshort w=840000u l=150000u
-+  ad=1.218e+12p pd=1.13e+07u as=9.408e+11p ps=8.96e+06u
-M1005 VGND A4 a_1291_65# VNB nshort w=840000u l=150000u
-+  ad=1.1508e+12p pd=1.114e+07u as=1.1508e+12p ps=1.114e+07u
-M1006 a_1291_65# A3 a_921_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=9.408e+11p ps=8.96e+06u
-M1007 a_30_367# B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1008 a_921_65# A2 a_478_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1291_65# A3 a_921_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_30_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_30_367# A4 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A2 a_30_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_30_367# B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A4 a_30_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A4 a_1291_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A2 a_30_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_478_65# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A3 a_30_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_478_65# A2 a_921_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y B1 a_30_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR A4 a_30_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1291_65# A4 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_30_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y B1 a_30_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_478_65# A2 a_921_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1291_65# A4 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_921_65# A3 a_1291_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_30_367# A2 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR A3 a_30_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_30_367# A3 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Y A1 a_478_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_921_65# A3 a_1291_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR A1 a_30_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Y A1 a_478_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_921_65# A2 a_478_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 Y B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_921_65# A3 a_1291_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_1291_65# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_30_367# A4 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_478_65# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR A4 a_30_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND A4 a_1291_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 Y A1 a_478_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_921_65# A2 a_478_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_1291_65# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_30_367# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VPWR A2 a_30_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_921_65# A2 a_478_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_1291_65# A3 a_921_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VPWR A1 a_30_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 VPWR A1 a_30_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 VPWR A4 a_30_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 a_921_65# A3 a_1291_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 Y A1 a_478_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 Y B1 a_30_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 a_30_367# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 a_478_65# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 VPWR A3 a_30_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 VGND A4 a_1291_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 a_30_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 a_30_367# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 VPWR A2 a_30_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 a_30_367# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 VPWR A3 a_30_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 a_30_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 a_30_367# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X32 a_30_367# A4 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X33 Y B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X34 a_478_65# A2 a_921_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X35 Y B1 a_30_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X36 a_30_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X37 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X38 a_478_65# A2 a_921_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X39 a_1291_65# A3 a_921_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.cdl b/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.cdl
index a5bd39e..3b48d03 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.cdl
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.cdl
@@ -16,26 +16,26 @@
 
 .SUBCKT sky130_fd_sc_lp__a41oi_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 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
+MMPA1 pndA A2 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
+MMPA2 pndA A3 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
+MMPA3 pndA A4 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
+MMPB0 Y B1 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
-MMPA1 pndA A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 net75 A2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA2 net74 A3 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA3 net67 A4 VNB nfet_01v8 m=1 w=0.42 l=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.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MI12 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA3 pndA A4 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
-MMPB0 Y B1 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
-MMNA1 net75 A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 net74 A3 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA3 net67 A4 VNB nshort m=1 w=0.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 Y A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net62 B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net62 B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__a41oi_lp
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.netlist.tsv b/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.netlist.tsv
index fad659a..9bb900d 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.netlist.tsv
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.netlist.tsv
@@ -1,13 +1,13 @@
 sky130_fd_sc_lp__a41oi_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	net75	A2	net74	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	net74	A3	net67	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	net67	A4	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	net62	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Y	A1	net75	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net62	B1	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	pndA	A4	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	net75	A2	net74	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	net74	A3	net67	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	net67	A4	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	net62	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Y	A1	net75	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net62	B1	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/a41oi/sky130_fd_sc_lp__a41oi_lp.spice b/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.spice
index cb50e5d..19b064b 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.spice
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.spice
@@ -16,26 +16,15 @@
 
 
 .subckt sky130_fd_sc_lp__a41oi_lp A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 Y A1 a_326_47# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.512e+11p ps=1.56e+06u
-M1001 a_248_47# A3 a_170_47# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.008e+11p ps=1.32e+06u
-M1002 VPWR A2 a_27_409# VPB phighvt w=1e+06u l=250000u
-+  ad=5.8e+11p pd=5.16e+06u as=8.45e+11p ps=7.69e+06u
-M1003 VPWR A4 a_27_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B1 a_27_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1005 a_514_47# B1 Y VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1006 VGND B1 a_514_47# VNB nshort w=420000u l=150000u
-+  ad=2.394e+11p pd=2.82e+06u as=0p ps=0u
-M1007 a_27_409# A3 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_409# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_326_47# A2 a_248_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_170_47# A4 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_326_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR A3 a_27_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 VPWR A1 a_27_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 Y B1 a_514_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_27_409# A4 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_27_409# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_514_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_170_47# A3 a_248_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_27_409# B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_248_47# A2 a_326_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND A4 a_170_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_m.cdl b/cells/a41oi/sky130_fd_sc_lp__a41oi_m.cdl
index 514b679..d48e753 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_m.cdl
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__a41oi_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 pndA A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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.42 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=0.42 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=0.42 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=0.42 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=0.42 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.42 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.42 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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 sndA1 A2 VNB nfet_01v8 m=1 w=0.42 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.42 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.42 l=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.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_lp__a41oi_m
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_m.netlist.tsv b/cells/a41oi/sky130_fd_sc_lp__a41oi_m.netlist.tsv
index 9dbf59a..7f0516a 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_m.netlist.tsv
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__a41oi_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	pndA	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	pndA	A3	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	pndA	A4	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	Y	B1	pndA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	Y	A1	sndA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	sndA3	A4	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	pndA	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	pndA	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	pndA	A3	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	pndA	A4	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	Y	B1	pndA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	Y	A1	sndA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	sndA1	A2	sndA2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	sndA2	A3	sndA3	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	sndA3	A4	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	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/a41oi/sky130_fd_sc_lp__a41oi_m.spice b/cells/a41oi/sky130_fd_sc_lp__a41oi_m.spice
index 239a9c7..29ad848 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_m.spice
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__a41oi_m A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 a_186_531# A4 VPWR VPB phighvt w=420000u l=150000u
-+  ad=3.465e+11p pd=4.17e+06u as=2.352e+11p ps=2.8e+06u
-M1001 a_300_47# A1 Y VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1002 a_466_47# A3 a_372_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.344e+11p ps=1.48e+06u
-M1003 a_372_47# A2 a_300_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A4 a_466_47# VNB nshort w=420000u l=150000u
-+  ad=2.226e+11p pd=2.74e+06u as=0p ps=0u
-M1005 VPWR A1 a_186_531# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A3 a_186_531# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_186_531# B1 Y VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.331e+11p ps=1.95e+06u
-M1008 Y B1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_186_531# A2 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 Y A1 a_300_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_466_47# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR A2 a_186_531# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_186_531# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_372_47# A3 a_466_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_186_531# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_300_47# A2 a_372_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR A4 a_186_531# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 Y B1 a_186_531# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/and2/sky130_fd_sc_lp__and2_0.cdl b/cells/and2/sky130_fd_sc_lp__and2_0.cdl
index 05ad5c0..d0861d5 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_0.cdl
+++ b/cells/and2/sky130_fd_sc_lp__and2_0.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__and2_0 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMIP0 X y VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y 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
-MMN0 y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=1 w=0.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_lp__and2_0
diff --git a/cells/and2/sky130_fd_sc_lp__and2_0.netlist.tsv b/cells/and2/sky130_fd_sc_lp__and2_0.netlist.tsv
index f8b63a3..ff9e431 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_0.netlist.tsv
+++ b/cells/and2/sky130_fd_sc_lp__and2_0.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__and2_0	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	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/and2/sky130_fd_sc_lp__and2_0.spice b/cells/and2/sky130_fd_sc_lp__and2_0.spice
index f35b82a..e45d248 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_0.spice
+++ b/cells/and2/sky130_fd_sc_lp__and2_0.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__and2_0 A B VGND VNB VPB VPWR X
-M1000 a_63_47# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=4.773e+11p ps=3.89e+06u
-M1001 VGND B a_146_47# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=8.82e+10p ps=1.26e+06u
-M1002 X a_63_47# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1003 a_146_47# A a_63_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 X a_63_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1005 VPWR B a_63_47# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_63_47# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VPWR a_63_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_63_47# A a_146_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_146_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR A a_63_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VGND a_63_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and2/sky130_fd_sc_lp__and2_1.cdl b/cells/and2/sky130_fd_sc_lp__and2_1.cdl
index 78e45c5..2ab2d0f 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_1.cdl
+++ b/cells/and2/sky130_fd_sc_lp__and2_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMIP0 X y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=1 w=0.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_lp__and2_1
diff --git a/cells/and2/sky130_fd_sc_lp__and2_1.netlist.tsv b/cells/and2/sky130_fd_sc_lp__and2_1.netlist.tsv
index 9382998..8f18c89 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_1.netlist.tsv
+++ b/cells/and2/sky130_fd_sc_lp__and2_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2/sky130_fd_sc_lp__and2_1.spice b/cells/and2/sky130_fd_sc_lp__and2_1.spice
index ba41b1e..e8e6071 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_1.spice
+++ b/cells/and2/sky130_fd_sc_lp__and2_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__and2_1 A B VGND VNB VPB VPWR X
-M1000 a_92_131# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=5.166e+11p ps=4.76e+06u
-M1001 X a_92_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1002 VPWR B a_92_131# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND B a_175_131# VNB nshort w=420000u l=150000u
-+  ad=2.919e+11p pd=2.46e+06u as=8.82e+10p ps=1.26e+06u
-M1004 X a_92_131# VGND VNB nshort w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1005 a_175_131# A a_92_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 a_175_131# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR a_92_131# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VGND a_92_131# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_92_131# A a_175_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_92_131# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VPWR A a_92_131# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/and2/sky130_fd_sc_lp__and2_2.cdl b/cells/and2/sky130_fd_sc_lp__and2_2.cdl
index 6213978..c78de99 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_2.cdl
+++ b/cells/and2/sky130_fd_sc_lp__and2_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMIP0 X y VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=2 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=2 w=0.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_lp__and2_2
diff --git a/cells/and2/sky130_fd_sc_lp__and2_2.netlist.tsv b/cells/and2/sky130_fd_sc_lp__and2_2.netlist.tsv
index ef02801..f7791ae 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_2.netlist.tsv
+++ b/cells/and2/sky130_fd_sc_lp__and2_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2/sky130_fd_sc_lp__and2_2.spice b/cells/and2/sky130_fd_sc_lp__and2_2.spice
index b979695..a69f51f 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_2.spice
+++ b/cells/and2/sky130_fd_sc_lp__and2_2.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__and2_2 A B VGND VNB VPB VPWR X
-M1000 VPWR B a_46_47# VPB phighvt w=420000u l=150000u
-+  ad=8.253e+11p pd=7.69e+06u as=1.176e+11p ps=1.4e+06u
-M1001 VPWR a_46_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1002 X a_46_47# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=4.914e+11p ps=4.64e+06u
-M1003 a_129_47# A a_46_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1004 X a_46_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_46_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_46_47# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B a_129_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_129_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR a_46_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VGND a_46_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 X a_46_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_46_47# A a_129_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_46_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VPWR A a_46_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_46_47# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/and2/sky130_fd_sc_lp__and2_4.cdl b/cells/and2/sky130_fd_sc_lp__and2_4.cdl
index 3fdfa0b..0d41426 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_4.cdl
+++ b/cells/and2/sky130_fd_sc_lp__and2_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=4 w=1.26 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=4 w=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_lp__and2_4
diff --git a/cells/and2/sky130_fd_sc_lp__and2_4.netlist.tsv b/cells/and2/sky130_fd_sc_lp__and2_4.netlist.tsv
index 684b14b..2b9b6e7 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_4.netlist.tsv
+++ b/cells/and2/sky130_fd_sc_lp__and2_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2/sky130_fd_sc_lp__and2_4.spice b/cells/and2/sky130_fd_sc_lp__and2_4.spice
index a1fa707..ba564d8 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_4.spice
+++ b/cells/and2/sky130_fd_sc_lp__and2_4.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__and2_4 A B VGND VNB VPB VPWR X
-M1000 VGND B a_110_47# VNB nshort w=840000u l=150000u
-+  ad=8.148e+11p pd=6.98e+06u as=1.764e+11p ps=2.1e+06u
-M1001 VPWR a_27_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4679e+12p pd=1.241e+07u as=7.056e+11p ps=6.16e+06u
-M1002 X a_27_47# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1003 X a_27_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_110_47# A a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1005 VPWR B a_27_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1006 VPWR a_27_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_27_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_27_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_27_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_27_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_47# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_110_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_27_47# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_27_47# A a_110_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR A a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/and2/sky130_fd_sc_lp__and2_lp.cdl b/cells/and2/sky130_fd_sc_lp__and2_lp.cdl
index c896e42..f662b72 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_lp.cdl
+++ b/cells/and2/sky130_fd_sc_lp__and2_lp.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__and2_lp 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMIP0 X y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net28 B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net28 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
+MI7 net25 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
+MI6 net33 y VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net25 A VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net33 y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 sndA 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
-MMIN0 X y VNB nshort m=1 w=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 net45 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI5 net45 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__and2_lp
diff --git a/cells/and2/sky130_fd_sc_lp__and2_lp.netlist.tsv b/cells/and2/sky130_fd_sc_lp__and2_lp.netlist.tsv
index 5934ba2..d41d001 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_lp.netlist.tsv
+++ b/cells/and2/sky130_fd_sc_lp__and2_lp.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__and2_lp	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	net25	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	net28	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	net33	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net28	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net25	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net33	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	net45	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net45	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	net25	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	net28	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	net33	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net28	B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net25	A	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net33	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	net45	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net45	y	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/and2/sky130_fd_sc_lp__and2_lp.spice b/cells/and2/sky130_fd_sc_lp__and2_lp.spice
index f2907a1..4545078 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_lp.spice
+++ b/cells/and2/sky130_fd_sc_lp__and2_lp.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__and2_lp A B VGND VNB VPB VPWR X
-M1000 a_494_92# a_213_468# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.394e+11p ps=2.82e+06u
-M1001 X a_213_468# a_494_92# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1002 a_177_174# B VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1003 VPWR A a_299_468# VPB phighvt w=420000u l=150000u
-+  ad=2.373e+11p pd=2.81e+06u as=8.82e+10p ps=1.26e+06u
-M1004 a_299_468# A a_213_468# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1005 a_213_468# B a_141_468# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1006 X a_213_468# a_457_468# VPB phighvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1007 a_213_468# A a_177_174# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1008 a_141_468# B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_457_468# a_213_468# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B a_141_468# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VGND B a_177_174# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_457_468# a_213_468# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_494_92# a_213_468# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_177_174# A a_213_468# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_213_468# A a_299_468# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_141_468# B a_213_468# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND a_213_468# a_494_92# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_213_468# a_457_468# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_299_468# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/and2/sky130_fd_sc_lp__and2_lp2.cdl b/cells/and2/sky130_fd_sc_lp__and2_lp2.cdl
index 0adab84..808a6d6 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_lp2.cdl
+++ b/cells/and2/sky130_fd_sc_lp__and2_lp2.cdl
@@ -16,18 +16,18 @@
 
 .SUBCKT sky130_fd_sc_lp__and2_lp2 A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MI8 y B 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
-MI7 y A 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
-MI6 X y 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
-MMN0 y 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
-MI10 net43 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 y B 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
-MMIN0 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 y A 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
-MI5 net35 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 X y 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
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net43 B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net35 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__and2_lp2
diff --git a/cells/and2/sky130_fd_sc_lp__and2_lp2.netlist.tsv b/cells/and2/sky130_fd_sc_lp__and2_lp2.netlist.tsv
index 060c88c..33a6c36 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_lp2.netlist.tsv
+++ b/cells/and2/sky130_fd_sc_lp__and2_lp2.netlist.tsv
@@ -1,9 +1,9 @@
 sky130_fd_sc_lp__and2_lp2	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
-MI8	MOSFET	y	B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	y	A	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	net43	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net43	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	net35	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net35	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	y	A	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	net43	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net43	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	net35	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net35	y	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/and2/sky130_fd_sc_lp__and2_lp2.spice b/cells/and2/sky130_fd_sc_lp__and2_lp2.spice
index 78a4113..5dae357 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_lp2.spice
+++ b/cells/and2/sky130_fd_sc_lp__and2_lp2.spice
@@ -16,18 +16,11 @@
 
 
 .subckt sky130_fd_sc_lp__and2_lp2 A B VGND VNB VPB VPWR X
-M1000 VPWR a_99_21# X VPB phighvt w=1e+06u l=250000u
-+  ad=5.65e+11p pd=5.13e+06u as=2.85e+11p ps=2.57e+06u
-M1001 a_129_47# a_99_21# X VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1002 a_99_21# A a_287_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.008e+11p ps=1.32e+06u
-M1003 a_287_47# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1004 a_99_21# B VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=3.1e+11p pd=2.62e+06u as=0p ps=0u
-M1005 VPWR A a_99_21# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_99_21# a_129_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B a_99_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_287_47# A a_99_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_99_21# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_129_47# a_99_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 X a_99_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 X a_99_21# a_129_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND B a_287_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and2/sky130_fd_sc_lp__and2_m.cdl b/cells/and2/sky130_fd_sc_lp__and2_m.cdl
index 68a440a..1c39be8 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_m.cdl
+++ b/cells/and2/sky130_fd_sc_lp__and2_m.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__and2_m 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMIP0 X y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=1 w=0.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_lp__and2_m
diff --git a/cells/and2/sky130_fd_sc_lp__and2_m.netlist.tsv b/cells/and2/sky130_fd_sc_lp__and2_m.netlist.tsv
index 8b0caaa..2a69f79 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_m.netlist.tsv
+++ b/cells/and2/sky130_fd_sc_lp__and2_m.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__and2_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	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/and2/sky130_fd_sc_lp__and2_m.spice b/cells/and2/sky130_fd_sc_lp__and2_m.spice
index 62fe83b..b9183eb 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_m.spice
+++ b/cells/and2/sky130_fd_sc_lp__and2_m.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__and2_m A B VGND VNB VPB VPWR X
-M1000 X a_34_141# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=2.688e+11p ps=2.96e+06u
-M1001 VGND B a_117_141# VNB nshort w=420000u l=150000u
-+  ad=1.785e+11p pd=1.69e+06u as=8.82e+10p ps=1.26e+06u
-M1002 X a_34_141# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1003 a_34_141# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1004 a_117_141# A a_34_141# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 VPWR B a_34_141# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_34_141# A a_117_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR a_34_141# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VPWR A a_34_141# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VGND a_34_141# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_34_141# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_117_141# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_1.cdl b/cells/and2b/sky130_fd_sc_lp__and2b_1.cdl
index 42527c7..3badbf7 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_1.cdl
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=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 X y VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__and2b_1
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_1.netlist.tsv b/cells/and2b/sky130_fd_sc_lp__and2b_1.netlist.tsv
index bb1280d..05d9423 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_1.netlist.tsv
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.42	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.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_1.spice b/cells/and2b/sky130_fd_sc_lp__and2b_1.spice
index 9d4aacf..bc9dac6 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_1.spice
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__and2b_1 A_N B VGND VNB VPB VPWR X
-M1000 a_217_131# a_27_47# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.701e+11p pd=1.65e+06u as=5.817e+11p ps=5.07e+06u
-M1001 VPWR B a_217_131# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 X a_217_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1003 VGND A_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=4.053e+11p pd=3.92e+06u as=1.113e+11p ps=1.37e+06u
-M1004 VGND B a_300_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1005 X a_217_131# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1006 a_300_131# a_27_47# a_217_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 VPWR A_N a_27_47# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 VPWR a_217_131# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_27_47# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VGND a_217_131# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_27_47# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_300_131# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_217_131# a_27_47# a_300_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_27_47# a_217_131# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_217_131# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_2.cdl b/cells/and2b/sky130_fd_sc_lp__and2b_2.cdl
index 6b3455e..935e4ba 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_2.cdl
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=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 X y VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X y VNB nfet_01v8 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_lp__and2b_2
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_2.netlist.tsv b/cells/and2b/sky130_fd_sc_lp__and2b_2.netlist.tsv
index 6b8666a..26ca720 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_2.netlist.tsv
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.42	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.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_2.spice b/cells/and2b/sky130_fd_sc_lp__and2b_2.spice
index bc13bbe..4e4a4b7 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_2.spice
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__and2b_2 A_N B VGND VNB VPB VPWR X
-M1000 VPWR a_186_239# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=9.429e+11p pd=8.25e+06u as=3.528e+11p ps=3.08e+06u
-M1001 X a_186_239# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND a_186_239# X VNB nshort w=840000u l=150000u
-+  ad=7.4e+11p pd=5.56e+06u as=2.352e+11p ps=2.24e+06u
-M1003 a_186_239# B VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1004 VGND A_N a_28_367# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1005 a_186_239# a_28_367# a_455_133# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1006 VPWR A_N a_28_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 VPWR a_28_367# a_186_239# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_186_239# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_455_133# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_186_239# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_186_239# a_28_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_28_367# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VGND B a_455_133# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_186_239# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPWR a_186_239# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VPWR B a_186_239# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_455_133# a_28_367# a_186_239# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_28_367# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 X a_186_239# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_4.cdl b/cells/and2b/sky130_fd_sc_lp__and2b_4.cdl
index ef7713c..6139a9f 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_4.cdl
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=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 X y VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort 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.84 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X y VNB nfet_01v8 m=4 w=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_lp__and2b_4
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_4.netlist.tsv b/cells/and2b/sky130_fd_sc_lp__and2b_4.netlist.tsv
index 751275f..3a23f72 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_4.netlist.tsv
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_4.spice b/cells/and2b/sky130_fd_sc_lp__and2b_4.spice
index 7f2cda1..5c58faa 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_4.spice
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_4.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__and2b_4 A_N B VGND VNB VPB VPWR X
-M1000 X a_213_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=1.5393e+12p ps=1.275e+07u
-M1001 X a_213_23# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=8.61e+11p ps=7.2e+06u
-M1002 VPWR a_213_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_43_367# a_213_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1004 VPWR A_N a_43_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 VPWR a_213_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A_N a_43_367# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 VGND a_213_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_213_23# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_213_23# B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_616_49# B VGND VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1011 a_213_23# a_43_367# a_616_49# VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1012 VGND a_213_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_213_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_43_367# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_213_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VGND a_213_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 X a_213_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND B a_616_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPWR a_213_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND a_213_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_43_367# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VPWR a_213_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 X a_213_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_213_23# a_43_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VPWR B a_213_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_616_49# a_43_367# a_213_23# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 X a_213_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_lp.cdl b/cells/and2b/sky130_fd_sc_lp__and2b_lp.cdl
index bd90c66..53941dc 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_lp.cdl
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_lp.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__and2b_lp 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 l=0.25 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 l=0.25 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 y A 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
-MMIP1 X y 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
-MMN0 y 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
-MMN1 net58 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B 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
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N 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
-MMIN1 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X y 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 net49 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net53 A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 net58 B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net49 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net53 A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__and2b_lp
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_lp.netlist.tsv b/cells/and2b/sky130_fd_sc_lp__and2b_lp.netlist.tsv
index bc15552..0f9ebc5 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_lp.netlist.tsv
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_lp.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__and2b_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	net58	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	net58	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	net53	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	net49	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net49	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net53	A_N	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	net58	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	net58	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	net53	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	net49	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net49	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net53	A_N	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/and2b/sky130_fd_sc_lp__and2b_lp.spice b/cells/and2b/sky130_fd_sc_lp__and2b_lp.spice
index a451476..67f90b8 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_lp.spice
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_lp.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__and2b_lp A_N B VGND VNB VPB VPWR X
-M1000 a_108_127# B VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.8e+11p pd=2.56e+06u as=8.9e+11p ps=5.78e+06u
-M1001 a_313_153# B VGND VNB nshort w=420000u l=150000u
-+  ad=1.645e+11p pd=1.81e+06u as=2.604e+11p ps=2.92e+06u
-M1002 a_378_159# A_N VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1003 VGND a_108_127# a_138_153# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1004 a_108_127# a_378_159# a_313_153# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1005 a_510_47# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1006 a_138_153# a_108_127# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1007 a_378_159# A_N a_510_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1008 VPWR a_108_127# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1009 VPWR a_378_159# a_108_127# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_108_127# a_378_159# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 VGND B a_313_153# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR A_N a_378_159# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_510_47# A_N a_378_159# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_138_153# a_108_127# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND A_N a_510_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR B a_108_127# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 X a_108_127# a_138_153# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 X a_108_127# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_313_153# a_378_159# a_108_127# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_m.cdl b/cells/and2b/sky130_fd_sc_lp__and2b_m.cdl
index d18c29f..bf4b6a2 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_m.cdl
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_m.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__and2b_m 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=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 X y VPB pfet_01v8_hvt m=1 w=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 X y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__and2b_m
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_m.netlist.tsv b/cells/and2b/sky130_fd_sc_lp__and2b_m.netlist.tsv
index 27be9b1..0f1cc1f 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_m.netlist.tsv
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_m.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__and2b_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nshort	1	0.42	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	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/and2b/sky130_fd_sc_lp__and2b_m.spice b/cells/and2b/sky130_fd_sc_lp__and2b_m.spice
index 1f9000c..d83a659 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_m.spice
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_m.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__and2b_m A_N B VGND VNB VPB VPWR X
-M1000 VPWR A_N a_35_70# VPB phighvt w=420000u l=150000u
-+  ad=3.99e+11p pd=3.58e+06u as=1.113e+11p ps=1.37e+06u
-M1001 X a_255_47# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1002 a_338_47# a_35_70# a_255_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1003 VPWR B a_255_47# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1004 X a_255_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=2.289e+11p ps=2.77e+06u
-M1005 VGND B a_338_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_255_47# a_35_70# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A_N a_35_70# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 VPWR a_35_70# a_255_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_255_47# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_338_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_35_70# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_35_70# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_255_47# a_35_70# a_338_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_255_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_255_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/and3/sky130_fd_sc_lp__and3_0.cdl b/cells/and3/sky130_fd_sc_lp__and3_0.cdl
index 3c48278..cd463a2 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_0.cdl
+++ b/cells/and3/sky130_fd_sc_lp__and3_0.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__and3_0 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=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 X y VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y 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
-MMN0 y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=1 w=0.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_lp__and3_0
diff --git a/cells/and3/sky130_fd_sc_lp__and3_0.netlist.tsv b/cells/and3/sky130_fd_sc_lp__and3_0.netlist.tsv
index 8e59bcc..c2baddf 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_0.netlist.tsv
+++ b/cells/and3/sky130_fd_sc_lp__and3_0.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__and3_0	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	1	0.42	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	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/and3/sky130_fd_sc_lp__and3_0.spice b/cells/and3/sky130_fd_sc_lp__and3_0.spice
index 437035a..238b406 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_0.spice
+++ b/cells/and3/sky130_fd_sc_lp__and3_0.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__and3_0 A B C VGND VNB VPB VPWR X
-M1000 VPWR C a_68_65# VPB phighvt w=420000u l=150000u
-+  ad=4.726e+11p pd=3.92e+06u as=2.289e+11p ps=2.77e+06u
-M1001 VGND C a_229_65# VNB nshort w=420000u l=150000u
-+  ad=3.465e+11p pd=2.49e+06u as=8.82e+10p ps=1.26e+06u
-M1002 a_68_65# B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_229_65# B a_157_65# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1004 X a_68_65# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.76e+11p pd=1.83e+06u as=0p ps=0u
-M1005 a_157_65# A a_68_65# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.239e+11p ps=1.43e+06u
-M1006 X a_68_65# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1007 VPWR A a_68_65# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_68_65# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_229_65# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_68_65# X VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 VGND a_68_65# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_68_65# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_68_65# A a_157_65# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR B a_68_65# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_157_65# B a_229_65# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and3/sky130_fd_sc_lp__and3_1.cdl b/cells/and3/sky130_fd_sc_lp__and3_1.cdl
index f1e242b..6369fa9 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_1.cdl
+++ b/cells/and3/sky130_fd_sc_lp__and3_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=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 X y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=1 w=0.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_lp__and3_1
diff --git a/cells/and3/sky130_fd_sc_lp__and3_1.netlist.tsv b/cells/and3/sky130_fd_sc_lp__and3_1.netlist.tsv
index 13ec6df..5afc05a 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_1.netlist.tsv
+++ b/cells/and3/sky130_fd_sc_lp__and3_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.42	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.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3/sky130_fd_sc_lp__and3_1.spice b/cells/and3/sky130_fd_sc_lp__and3_1.spice
index 21ba8c0..efc4e82 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_1.spice
+++ b/cells/and3/sky130_fd_sc_lp__and3_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__and3_1 A B C VGND VNB VPB VPWR X
-M1000 VPWR C a_61_367# VPB phighvt w=420000u l=150000u
-+  ad=6.153e+11p pd=5.23e+06u as=2.604e+11p ps=2.92e+06u
-M1001 X a_61_367# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=2.982e+11p ps=2.57e+06u
-M1002 a_149_53# A a_61_367# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.113e+11p ps=1.37e+06u
-M1003 X a_61_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1004 VGND C a_227_53# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.638e+11p ps=1.62e+06u
-M1005 VPWR A a_61_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_227_53# B a_149_53# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_61_367# B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_61_367# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VGND a_61_367# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_61_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_227_53# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_61_367# A a_149_53# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR B a_61_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VPWR a_61_367# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_149_53# B a_227_53# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and3/sky130_fd_sc_lp__and3_2.cdl b/cells/and3/sky130_fd_sc_lp__and3_2.cdl
index 14bee17..cbe3a4a 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_2.cdl
+++ b/cells/and3/sky130_fd_sc_lp__and3_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=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 X y VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=2 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=2 w=0.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_lp__and3_2
diff --git a/cells/and3/sky130_fd_sc_lp__and3_2.netlist.tsv b/cells/and3/sky130_fd_sc_lp__and3_2.netlist.tsv
index 881fb26..b8c17ee 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_2.netlist.tsv
+++ b/cells/and3/sky130_fd_sc_lp__and3_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.42	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.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3/sky130_fd_sc_lp__and3_2.spice b/cells/and3/sky130_fd_sc_lp__and3_2.spice
index 68130c5..49697d0 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_2.spice
+++ b/cells/and3/sky130_fd_sc_lp__and3_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__and3_2 A B C VGND VNB VPB VPWR X
-M1000 VPWR A a_27_385# VPB phighvt w=420000u l=150000u
-+  ad=8.505e+11p pd=7.75e+06u as=2.604e+11p ps=2.92e+06u
-M1001 X a_27_385# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1002 X a_27_385# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=5.649e+11p ps=4.96e+06u
-M1003 a_27_385# B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_196_47# B a_124_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=8.82e+10p ps=1.26e+06u
-M1005 VGND C a_196_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR C a_27_385# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_27_385# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_124_47# A a_27_385# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1009 VGND a_27_385# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_385# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VGND a_27_385# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_27_385# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 X a_27_385# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR a_27_385# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 X a_27_385# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_196_47# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_124_47# B a_196_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_27_385# A a_124_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR B a_27_385# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/and3/sky130_fd_sc_lp__and3_4.cdl b/cells/and3/sky130_fd_sc_lp__and3_4.cdl
index da2e86e..71c5cfb 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_4.cdl
+++ b/cells/and3/sky130_fd_sc_lp__and3_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=4 w=1.26 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=4 w=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_lp__and3_4
diff --git a/cells/and3/sky130_fd_sc_lp__and3_4.netlist.tsv b/cells/and3/sky130_fd_sc_lp__and3_4.netlist.tsv
index 8b527f7..52970bf 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_4.netlist.tsv
+++ b/cells/and3/sky130_fd_sc_lp__and3_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3/sky130_fd_sc_lp__and3_4.spice b/cells/and3/sky130_fd_sc_lp__and3_4.spice
index 616e89e..5c4c5cd 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_4.spice
+++ b/cells/and3/sky130_fd_sc_lp__and3_4.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__and3_4 A B C VGND VNB VPB VPWR X
-M1000 VPWR A a_77_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.6254e+12p pd=1.266e+07u as=6.867e+11p ps=6.13e+06u
-M1001 a_77_47# B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 X a_77_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1003 a_160_47# A a_77_47# VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=2.226e+11p ps=2.21e+06u
-M1004 a_232_47# B a_160_47# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=0p ps=0u
-M1005 X a_77_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_77_47# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=8.148e+11p ps=6.98e+06u
-M1007 VGND C a_232_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_77_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_77_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_77_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR C a_77_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_77_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_77_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_77_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_77_47# A a_160_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR a_77_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_77_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND a_77_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 X a_77_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR a_77_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 X a_77_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_160_47# B a_232_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_232_47# C VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VGND a_77_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_77_47# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VPWR B a_77_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 X a_77_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/and3/sky130_fd_sc_lp__and3_lp.cdl b/cells/and3/sky130_fd_sc_lp__and3_lp.cdl
index 9da09a7..2b7b603 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_lp.cdl
+++ b/cells/and3/sky130_fd_sc_lp__and3_lp.cdl
@@ -16,22 +16,22 @@
 
 .SUBCKT sky130_fd_sc_lp__and3_lp 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=1 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 net59 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A 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
-MI7 net55 C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B 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
-MMIN0 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C 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
-MI10 net50 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y 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
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 net59 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
+MI7 net55 C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net50 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__and3_lp
diff --git a/cells/and3/sky130_fd_sc_lp__and3_lp.netlist.tsv b/cells/and3/sky130_fd_sc_lp__and3_lp.netlist.tsv
index fdfee56..ed53f21 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_lp.netlist.tsv
+++ b/cells/and3/sky130_fd_sc_lp__and3_lp.netlist.tsv
@@ -1,11 +1,11 @@
 sky130_fd_sc_lp__and3_lp	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	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	net59	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	net59	B	net55	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net55	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	net50	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net50	y	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	net59	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	net59	B	net55	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net55	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	net50	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net50	y	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/and3/sky130_fd_sc_lp__and3_lp.spice b/cells/and3/sky130_fd_sc_lp__and3_lp.spice
index c25d662..a73e9cc 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_lp.spice
+++ b/cells/and3/sky130_fd_sc_lp__and3_lp.spice
@@ -16,22 +16,13 @@
 
 
 .subckt sky130_fd_sc_lp__and3_lp A B C VGND VNB VPB VPWR X
-M1000 a_38_416# B VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=5.65e+11p pd=5.13e+06u as=6e+11p ps=5.2e+06u
-M1001 VGND C a_234_47# VNB nshort w=420000u l=150000u
-+  ad=1.533e+11p pd=1.57e+06u as=1.008e+11p ps=1.32e+06u
-M1002 a_415_47# a_38_416# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1003 VPWR A a_38_416# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_38_416# a_415_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1005 X a_38_416# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1006 a_156_47# A a_38_416# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1007 a_234_47# B a_156_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR C a_38_416# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_38_416# a_415_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_38_416# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_156_47# B a_234_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_234_47# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_38_416# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_38_416# A a_156_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR B a_38_416# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 VPWR a_38_416# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_415_47# a_38_416# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and3/sky130_fd_sc_lp__and3_m.cdl b/cells/and3/sky130_fd_sc_lp__and3_m.cdl
index 62c0b5e..85f1376 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_m.cdl
+++ b/cells/and3/sky130_fd_sc_lp__and3_m.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__and3_m 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=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 X y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=1 w=0.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_lp__and3_m
diff --git a/cells/and3/sky130_fd_sc_lp__and3_m.netlist.tsv b/cells/and3/sky130_fd_sc_lp__and3_m.netlist.tsv
index 90d9a76..8536ddb 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_m.netlist.tsv
+++ b/cells/and3/sky130_fd_sc_lp__and3_m.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__and3_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	1	0.42	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	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/and3/sky130_fd_sc_lp__and3_m.spice b/cells/and3/sky130_fd_sc_lp__and3_m.spice
index 2fbeb12..25fc8a7 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_m.spice
+++ b/cells/and3/sky130_fd_sc_lp__and3_m.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__and3_m A B C VGND VNB VPB VPWR X
-M1000 a_51_47# B VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=2.352e+11p ps=2.8e+06u
-M1001 X a_51_47# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1002 a_206_47# B a_134_47# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=8.82e+10p ps=1.26e+06u
-M1003 VGND C a_206_47# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1004 a_134_47# A a_51_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 VPWR C a_51_47# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A a_51_47# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_51_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 a_51_47# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VPWR B a_51_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_51_47# A a_134_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR a_51_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_134_47# B a_206_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_51_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_206_47# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_51_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_1.cdl b/cells/and3b/sky130_fd_sc_lp__and3b_1.cdl
index 70b7cda..d7fc9bd 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_1.cdl
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=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 A A_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=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 X y VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__and3b_1
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_1.netlist.tsv b/cells/and3b/sky130_fd_sc_lp__and3b_1.netlist.tsv
index 8ec2f5c..843e44d 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_1.netlist.tsv
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.42	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.42	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.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_1.spice b/cells/and3b/sky130_fd_sc_lp__and3b_1.spice
index 83e669b..4768240 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_1.spice
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__and3b_1 A_N B C VGND VNB VPB VPWR X
-M1000 X a_185_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=6.447e+11p ps=6.21e+06u
-M1001 VPWR C a_185_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.436e+11p ps=2.84e+06u
-M1002 a_185_367# B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_110_47# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=4.557e+11p ps=4.16e+06u
-M1004 VPWR a_110_47# a_185_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_185_367# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1006 a_110_47# A_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1007 a_304_47# a_110_47# a_185_367# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1008 a_376_47# B a_304_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1009 VGND C a_376_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_376_47# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_185_367# a_110_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VGND A_N a_110_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR A_N a_110_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_185_367# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_304_47# B a_376_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_185_367# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VPWR B a_185_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_185_367# a_110_47# a_304_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR a_185_367# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_2.cdl b/cells/and3b/sky130_fd_sc_lp__and3b_2.cdl
index 60b5f29..bcca794 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_2.cdl
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=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 A A_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=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 X y VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X y VNB nfet_01v8 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_lp__and3b_2
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_2.netlist.tsv b/cells/and3b/sky130_fd_sc_lp__and3b_2.netlist.tsv
index ef6a5d3..ff7e513 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_2.netlist.tsv
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.42	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.42	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.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_2.spice b/cells/and3b/sky130_fd_sc_lp__and3b_2.spice
index 5aa2840..998f409 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_2.spice
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__and3b_2 A_N B C VGND VNB VPB VPWR X
-M1000 a_204_27# C VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=1.0983e+12p ps=8.79e+06u
-M1001 VPWR a_204_27# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1002 a_204_27# a_27_137# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_489_137# C VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=8.729e+11p ps=6.17e+06u
-M1004 VPWR B a_204_27# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A_N a_27_137# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 a_561_137# B a_489_137# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1007 a_204_27# a_27_137# a_561_137# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1008 VPWR A_N a_27_137# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1009 X a_204_27# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1010 VGND a_204_27# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_204_27# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_204_27# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VPWR C a_204_27# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_489_137# B a_561_137# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_27_137# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_204_27# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 X a_204_27# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 X a_204_27# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_27_137# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_204_27# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR a_27_137# a_204_27# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 VGND C a_489_137# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_561_137# a_27_137# a_204_27# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_4.cdl b/cells/and3b/sky130_fd_sc_lp__and3b_4.cdl
index 53f5cd4..57fb340 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_4.cdl
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=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 X y VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X y VNB nfet_01v8 m=4 w=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_lp__and3b_4
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_4.netlist.tsv b/cells/and3b/sky130_fd_sc_lp__and3b_4.netlist.tsv
index 561855b..b08ee63 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_4.netlist.tsv
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_4.spice b/cells/and3b/sky130_fd_sc_lp__and3b_4.spice
index 9753447..fe341e5 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_4.spice
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_4.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__and3b_4 A_N B C VGND VNB VPB VPWR X
-M1000 X a_242_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=1.7808e+12p ps=1.326e+07u
-M1001 a_242_23# C VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.867e+11p pd=6.13e+06u as=0p ps=0u
-M1002 X a_242_23# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=9.261e+11p ps=7.51e+06u
-M1003 X a_242_23# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_717_49# B a_645_49# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=1.764e+11p ps=2.1e+06u
-M1005 VPWR B a_242_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_242_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_242_23# a_49_133# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_242_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A_N a_49_133# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1010 a_242_23# a_49_133# a_717_49# VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1011 a_645_49# C VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_242_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_242_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_242_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A_N a_49_133# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
+X0 VGND a_242_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 X a_242_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 X a_242_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VGND a_242_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 X a_242_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND C a_645_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_49_133# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR C a_242_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_645_49# B a_717_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_717_49# a_49_133# a_242_23# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_49_133# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 X a_242_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VPWR a_242_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 VPWR a_242_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_242_23# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VPWR a_49_133# a_242_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_lp.cdl b/cells/and3b/sky130_fd_sc_lp__and3b_lp.cdl
index 82f693f..7f08187 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_lp.cdl
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_lp.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__and3b_lp 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 y A 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
-MMIP1 X y 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
-MMN0 y 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
-MMN1 net72 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B 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
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C 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
-MI7 net71 C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N 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
-MMIN1 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X y 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
-MI10 net56 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net52 A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 net72 B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net71 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
+MMIN1 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net56 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net52 A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__and3b_lp
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_lp.netlist.tsv b/cells/and3b/sky130_fd_sc_lp__and3b_lp.netlist.tsv
index 073be60..ed82bd2 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_lp.netlist.tsv
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_lp.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__and3b_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	net72	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	net72	B	net71	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	net52	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net71	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	net56	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net56	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net52	A_N	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	net72	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	net72	B	net71	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	net52	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net71	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	net56	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net56	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net52	A_N	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/and3b/sky130_fd_sc_lp__and3b_lp.spice b/cells/and3b/sky130_fd_sc_lp__and3b_lp.spice
index 5fc8b28..9494f12 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_lp.spice
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_lp.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__and3b_lp A_N B C VGND VNB VPB VPWR X
-M1000 a_666_57# a_248_409# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.066e+11p ps=3.14e+06u
-M1001 a_391_57# a_137_408# a_248_409# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1002 X a_248_409# a_666_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1003 a_248_409# B VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=5.65e+11p pd=5.13e+06u as=9.5e+11p ps=7.9e+06u
-M1004 X a_248_409# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1005 a_114_57# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1006 a_469_57# B a_391_57# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1007 VGND C a_469_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_137_408# a_248_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_137_408# A_N VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1010 VPWR C a_248_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_137_408# A_N a_114_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
+X0 a_248_409# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_666_57# a_248_409# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_391_57# B a_469_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_248_409# a_137_408# a_391_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR a_248_409# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 VGND a_248_409# a_666_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR B a_248_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 VPWR A_N a_137_408# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_114_57# A_N a_137_408# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_248_409# a_137_408# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 VGND A_N a_114_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_469_57# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_m.cdl b/cells/and3b/sky130_fd_sc_lp__and3b_m.cdl
index dca12e3..fa4e1b7 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_m.cdl
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__and3b_m 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=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 A A_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=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 X y VPB pfet_01v8_hvt m=1 w=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 X y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__and3b_m
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_m.netlist.tsv b/cells/and3b/sky130_fd_sc_lp__and3b_m.netlist.tsv
index deb100e..8849d43 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_m.netlist.tsv
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__and3b_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nshort	1	0.42	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.42	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	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/and3b/sky130_fd_sc_lp__and3b_m.spice b/cells/and3b/sky130_fd_sc_lp__and3b_m.spice
index 0441a77..e13cde1 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_m.spice
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__and3b_m A_N B C VGND VNB VPB VPWR X
-M1000 a_220_53# B VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=4.116e+11p ps=4.48e+06u
-M1001 X a_220_53# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1002 a_304_53# a_110_53# a_220_53# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.134e+11p ps=1.38e+06u
-M1003 a_376_53# B a_304_53# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1004 VPWR a_110_53# a_220_53# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND C a_376_53# VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=0p ps=0u
-M1006 a_110_53# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1007 VPWR C a_220_53# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_110_53# A_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1009 X a_220_53# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 a_220_53# a_110_53# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VGND A_N a_110_53# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_220_53# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_304_53# B a_376_53# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR A_N a_110_53# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_376_53# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_220_53# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_220_53# a_110_53# a_304_53# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_220_53# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VPWR B a_220_53# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/and4/sky130_fd_sc_lp__and4_0.cdl b/cells/and4/sky130_fd_sc_lp__and4_0.cdl
index 60dc2cd..1712a56 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_0.cdl
+++ b/cells/and4/sky130_fd_sc_lp__and4_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__and4_0 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y 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
-MMIP0 X y VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y 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
-MMN0 y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=1 w=0.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_lp__and4_0
diff --git a/cells/and4/sky130_fd_sc_lp__and4_0.netlist.tsv b/cells/and4/sky130_fd_sc_lp__and4_0.netlist.tsv
index 01961dd..37cacb0 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_0.netlist.tsv
+++ b/cells/and4/sky130_fd_sc_lp__and4_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__and4_0	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	1	0.42	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.42	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	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/and4/sky130_fd_sc_lp__and4_0.spice b/cells/and4/sky130_fd_sc_lp__and4_0.spice
index 0e8aafa..7a4c067 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_0.spice
+++ b/cells/and4/sky130_fd_sc_lp__and4_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__and4_0 A B C D VGND VNB VPB VPWR X
-M1000 VPWR B a_84_58# VPB phighvt w=420000u l=150000u
-+  ad=5.959e+11p pd=5.52e+06u as=2.352e+11p ps=2.8e+06u
-M1001 X a_84_58# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1002 a_167_58# A a_84_58# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1003 a_239_58# B a_167_58# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 VPWR D a_84_58# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_84_58# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=2.604e+11p ps=2.08e+06u
-M1006 a_311_58# C a_239_58# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1007 a_84_58# C VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND D a_311_58# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_84_58# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_84_58# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_84_58# A a_167_58# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_84_58# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_84_58# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VPWR a_84_58# X VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 VPWR C a_84_58# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_311_58# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_84_58# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_239_58# C a_311_58# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_167_58# B a_239_58# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and4/sky130_fd_sc_lp__and4_1.cdl b/cells/and4/sky130_fd_sc_lp__and4_1.cdl
index 2875c40..1b22467 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_1.cdl
+++ b/cells/and4/sky130_fd_sc_lp__and4_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y 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
-MMIP0 X y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=1 w=0.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_lp__and4_1
diff --git a/cells/and4/sky130_fd_sc_lp__and4_1.netlist.tsv b/cells/and4/sky130_fd_sc_lp__and4_1.netlist.tsv
index f07eefd..90e1471 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_1.netlist.tsv
+++ b/cells/and4/sky130_fd_sc_lp__and4_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.42	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.42	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.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4/sky130_fd_sc_lp__and4_1.spice b/cells/and4/sky130_fd_sc_lp__and4_1.spice
index c297362..6245c27 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_1.spice
+++ b/cells/and4/sky130_fd_sc_lp__and4_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__and4_1 A B C D VGND VNB VPB VPWR X
-M1000 VGND D a_327_47# VNB nshort w=420000u l=150000u
-+  ad=2.835e+11p pd=2.46e+06u as=1.638e+11p ps=1.62e+06u
-M1001 a_123_47# A a_40_47# VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=1.113e+11p ps=1.37e+06u
-M1002 a_219_47# B a_123_47# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1003 VPWR B a_40_47# VPB phighvt w=420000u l=150000u
-+  ad=7.854e+11p pd=6.88e+06u as=2.814e+11p ps=3.02e+06u
-M1004 VPWR D a_40_47# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_40_47# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1006 a_327_47# C a_219_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_40_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1008 a_40_47# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_40_47# C VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_40_47# A a_123_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_40_47# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_327_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR A a_40_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VGND a_40_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_40_47# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_123_47# B a_219_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_219_47# C a_327_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_40_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR C a_40_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/and4/sky130_fd_sc_lp__and4_2.cdl b/cells/and4/sky130_fd_sc_lp__and4_2.cdl
index 1a06ed4..ec49286 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_2.cdl
+++ b/cells/and4/sky130_fd_sc_lp__and4_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y 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
-MMIP0 X y VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=2 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=2 w=0.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_lp__and4_2
diff --git a/cells/and4/sky130_fd_sc_lp__and4_2.netlist.tsv b/cells/and4/sky130_fd_sc_lp__and4_2.netlist.tsv
index cfe70d3..4b4a9b0 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_2.netlist.tsv
+++ b/cells/and4/sky130_fd_sc_lp__and4_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.42	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.42	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.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4/sky130_fd_sc_lp__and4_2.spice b/cells/and4/sky130_fd_sc_lp__and4_2.spice
index 42f8c6e..6294427 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_2.spice
+++ b/cells/and4/sky130_fd_sc_lp__and4_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__and4_2 A B C D VGND VNB VPB VPWR X
-M1000 VPWR D a_72_49# VPB phighvt w=420000u l=150000u
-+  ad=1.1067e+12p pd=9.87e+06u as=2.352e+11p ps=2.8e+06u
-M1001 a_335_49# C a_227_49# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=1.638e+11p ps=1.62e+06u
-M1002 X a_72_49# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=5.922e+11p ps=5.12e+06u
-M1003 VPWR B a_72_49# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_72_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1005 a_72_49# C VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND D a_335_49# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_227_49# B a_155_49# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1008 VGND a_72_49# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_72_49# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_155_49# A a_72_49# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1011 VPWR a_72_49# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_72_49# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VPWR a_72_49# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_72_49# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 X a_72_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND a_72_49# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 X a_72_49# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_227_49# C a_335_49# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_335_49# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_72_49# A a_155_49# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR C a_72_49# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_72_49# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_155_49# B a_227_49# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and4/sky130_fd_sc_lp__and4_4.cdl b/cells/and4/sky130_fd_sc_lp__and4_4.cdl
index 5f34563..f6562da 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_4.cdl
+++ b/cells/and4/sky130_fd_sc_lp__and4_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=4 w=1.26 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=4 w=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_lp__and4_4
diff --git a/cells/and4/sky130_fd_sc_lp__and4_4.netlist.tsv b/cells/and4/sky130_fd_sc_lp__and4_4.netlist.tsv
index 796af6f..88702be 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_4.netlist.tsv
+++ b/cells/and4/sky130_fd_sc_lp__and4_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4/sky130_fd_sc_lp__and4_4.spice b/cells/and4/sky130_fd_sc_lp__and4_4.spice
index 024c6f1..67f396a 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_4.spice
+++ b/cells/and4/sky130_fd_sc_lp__and4_4.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__and4_4 A B C D VGND VNB VPB VPWR X
-M1000 a_58_47# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=2.0979e+12p ps=1.593e+07u
-M1001 VPWR a_58_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1002 VGND a_58_47# X VNB nshort w=840000u l=150000u
-+  ad=8.148e+11p pd=6.98e+06u as=4.704e+11p ps=4.48e+06u
-M1003 a_213_47# B a_141_47# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=1.764e+11p ps=2.1e+06u
-M1004 X a_58_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_58_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_58_47# C VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR B a_58_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_321_47# C a_213_47# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=0p ps=0u
-M1009 a_141_47# A a_58_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1010 X a_58_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_58_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR D a_58_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_58_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_58_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND D a_321_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_58_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 X a_58_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR A a_58_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_58_47# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR a_58_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 X a_58_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_58_47# A a_141_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_141_47# B a_213_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_213_47# C a_321_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 X a_58_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_58_47# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VPWR C a_58_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_321_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VGND a_58_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 X a_58_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VPWR a_58_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/and4/sky130_fd_sc_lp__and4_lp.cdl b/cells/and4/sky130_fd_sc_lp__and4_lp.cdl
index e2c1d32..e00b05d 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_lp.cdl
+++ b/cells/and4/sky130_fd_sc_lp__and4_lp.cdl
@@ -16,36 +16,36 @@
 
 .SUBCKT sky130_fd_sc_lp__and4_lp 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=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 net32 C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI11 net32 C VPB pfet_01v8_hvt m=1 w=0.42 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 pfet_01v8_hvt m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=1 w=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 X y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI12 net55 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
+MI10 net36 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
+MI9 net40 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
+MI8 net48 y VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net55 D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net36 B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net40 A VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net48 y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 sndA 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
-MMN2 sndB 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
-MMN3 sndC 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
-MMIN0 X y VNB nshort m=1 w=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 net71 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net71 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__and4_lp
diff --git a/cells/and4/sky130_fd_sc_lp__and4_lp.netlist.tsv b/cells/and4/sky130_fd_sc_lp__and4_lp.netlist.tsv
index cddc99b..0ef91d9 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_lp.netlist.tsv
+++ b/cells/and4/sky130_fd_sc_lp__and4_lp.netlist.tsv
@@ -1,18 +1,18 @@
 sky130_fd_sc_lp__and4_lp	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	net40	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	net36	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	net32	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net32	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	net55	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	net48	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net55	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net36	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net40	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net48	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	net71	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net71	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	y	A	net40	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	net36	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	net32	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net32	C	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	y	D	net55	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	net48	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net55	D	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net36	B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net40	A	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net48	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	net71	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net71	y	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/and4/sky130_fd_sc_lp__and4_lp.spice b/cells/and4/sky130_fd_sc_lp__and4_lp.spice
index a8521a6..6f8f1c0 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_lp.spice
+++ b/cells/and4/sky130_fd_sc_lp__and4_lp.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__and4_lp A B C D VGND VNB VPB VPWR X
-M1000 a_230_55# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.856e+11p ps=3.04e+06u
-M1001 a_422_55# B a_308_55# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.764e+11p ps=1.68e+06u
-M1002 a_186_485# A a_422_55# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1003 a_186_485# B a_430_485# VPB phighvt w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=8.82e+10p ps=1.26e+06u
-M1004 a_186_485# D a_114_485# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1005 a_114_485# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=3.549e+11p ps=4.21e+06u
-M1006 a_720_55# a_186_485# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1007 a_430_485# B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_746_485# a_186_485# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1009 X a_186_485# a_746_485# VPB phighvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1010 X a_186_485# a_720_55# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1011 a_272_485# C a_186_485# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1012 VPWR A a_588_485# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1013 a_588_485# A a_186_485# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_308_55# C a_230_55# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR C a_272_485# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_720_55# a_186_485# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND D a_230_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND a_186_485# a_720_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_422_55# A a_186_485# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_114_485# D a_186_485# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_186_485# A a_588_485# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_430_485# B a_186_485# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VPWR D a_114_485# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_230_55# C a_308_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_308_55# B a_422_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_186_485# C a_272_485# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_272_485# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 VPWR a_186_485# a_746_485# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 a_588_485# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 a_746_485# a_186_485# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 VPWR B a_430_485# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/and4/sky130_fd_sc_lp__and4_lp2.cdl b/cells/and4/sky130_fd_sc_lp__and4_lp2.cdl
index 82601c2..0fa9ade 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_lp2.cdl
+++ b/cells/and4/sky130_fd_sc_lp__and4_lp2.cdl
@@ -16,26 +16,26 @@
 
 .SUBCKT sky130_fd_sc_lp__and4_lp2 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 net71 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A 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
-MMN2 net67 C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B 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
-MMIN0 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C 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
-MI11 net62 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D 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 net55 D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y 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
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 net71 B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 net67 C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 net62 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net55 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
 .ENDS sky130_fd_sc_lp__and4_lp2
diff --git a/cells/and4/sky130_fd_sc_lp__and4_lp2.netlist.tsv b/cells/and4/sky130_fd_sc_lp__and4_lp2.netlist.tsv
index 70436b3..d4467c9 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_lp2.netlist.tsv
+++ b/cells/and4/sky130_fd_sc_lp__and4_lp2.netlist.tsv
@@ -1,13 +1,13 @@
 sky130_fd_sc_lp__and4_lp2	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	net71	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	net71	B	net67	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	net67	C	net55	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	net62	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net62	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net55	D	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	y	D	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	net71	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	net71	B	net67	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	net67	C	net55	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	net62	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net62	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net55	D	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/and4/sky130_fd_sc_lp__and4_lp2.spice b/cells/and4/sky130_fd_sc_lp__and4_lp2.spice
index e6c1164..6c5996f 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_lp2.spice
+++ b/cells/and4/sky130_fd_sc_lp__and4_lp2.spice
@@ -16,26 +16,15 @@
 
 
 .subckt sky130_fd_sc_lp__and4_lp2 A B C D VGND VNB VPB VPWR X
-M1000 a_84_21# A a_450_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.008e+11p ps=1.32e+06u
-M1001 VPWR A a_84_21# VPB phighvt w=1e+06u l=250000u
-+  ad=9.6e+11p pd=7.92e+06u as=5.6e+11p ps=5.12e+06u
-M1002 a_372_47# C a_294_47# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.008e+11p ps=1.32e+06u
-M1003 a_450_47# B a_372_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_294_47# D VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.638e+11p ps=1.62e+06u
-M1005 a_114_47# a_84_21# X VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1006 VPWR C a_84_21# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_84_21# B VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_84_21# a_114_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_84_21# D VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_84_21# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
+X0 a_114_47# a_84_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_84_21# a_114_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND D a_294_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR D a_84_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_372_47# B a_450_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_84_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_84_21# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_450_47# A a_84_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR B a_84_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_294_47# C a_372_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_84_21# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/and4/sky130_fd_sc_lp__and4_m.cdl b/cells/and4/sky130_fd_sc_lp__and4_m.cdl
index 43f4caf..7bfc1a9 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_m.cdl
+++ b/cells/and4/sky130_fd_sc_lp__and4_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__and4_m 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y 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
-MMIP0 X y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 X y VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 X y VNB nfet_01v8 m=1 w=0.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_lp__and4_m
diff --git a/cells/and4/sky130_fd_sc_lp__and4_m.netlist.tsv b/cells/and4/sky130_fd_sc_lp__and4_m.netlist.tsv
index a2cb701..2856912 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_m.netlist.tsv
+++ b/cells/and4/sky130_fd_sc_lp__and4_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__and4_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	X	y	VGND	VNB	nshort	1	0.42	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.42	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	X	y	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/and4/sky130_fd_sc_lp__and4_m.spice b/cells/and4/sky130_fd_sc_lp__and4_m.spice
index 5d5c8e5..aecc5d3 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_m.spice
+++ b/cells/and4/sky130_fd_sc_lp__and4_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__and4_m A B C D VGND VNB VPB VPWR X
-M1000 a_316_47# C a_208_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.638e+11p ps=1.62e+06u
-M1001 a_53_47# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=3.465e+11p ps=4.17e+06u
-M1002 a_136_47# A a_53_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1003 VGND D a_316_47# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1004 X a_53_47# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1005 X a_53_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 VPWR D a_53_47# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR B a_53_47# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_208_47# B a_136_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_53_47# C VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_136_47# B a_208_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_53_47# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_53_47# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VPWR a_53_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VPWR A a_53_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_208_47# C a_316_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_316_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR C a_53_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VGND a_53_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_53_47# A a_136_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_1.cdl b/cells/and4b/sky130_fd_sc_lp__and4b_1.cdl
index 418b6a7..86a41bf 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_1.cdl
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y 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
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=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 X y VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__and4b_1
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_1.netlist.tsv b/cells/and4b/sky130_fd_sc_lp__and4b_1.netlist.tsv
index bc4d19a..05ee953 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_1.netlist.tsv
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.42	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.42	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.42	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.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_1.spice b/cells/and4b/sky130_fd_sc_lp__and4b_1.spice
index 6da2ece..827e407 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_1.spice
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__and4b_1 A_N B C D VGND VNB VPB VPWR X
-M1000 X a_215_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=8.463e+11p ps=7.17e+06u
-M1001 a_300_47# a_27_49# a_215_367# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1002 VPWR B a_215_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1003 a_372_47# B a_300_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 a_444_47# C a_372_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1005 VGND A_N a_27_49# VNB nshort w=420000u l=150000u
-+  ad=4.977e+11p pd=4.36e+06u as=1.113e+11p ps=1.37e+06u
-M1006 X a_215_367# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1007 VPWR D a_215_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_215_367# a_27_49# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_215_367# C VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A_N a_27_49# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1011 VGND D a_444_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_215_367# a_27_49# a_300_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_27_49# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_27_49# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR C a_215_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VPWR a_215_367# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND a_215_367# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_372_47# C a_444_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_444_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_215_367# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VPWR a_27_49# a_215_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_300_47# B a_372_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_215_367# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_2.cdl b/cells/and4b/sky130_fd_sc_lp__and4b_2.cdl
index 15c0964..fa03a5b 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_2.cdl
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y 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
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=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 X y VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X y VNB nfet_01v8 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_lp__and4b_2
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_2.netlist.tsv b/cells/and4b/sky130_fd_sc_lp__and4b_2.netlist.tsv
index 4672409..9b5b4be 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_2.netlist.tsv
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.42	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.42	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.42	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.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_2.spice b/cells/and4b/sky130_fd_sc_lp__and4b_2.spice
index d9deb5a..13407d4 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_2.spice
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__and4b_2 A_N B C D VGND VNB VPB VPWR X
-M1000 VPWR a_222_375# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.1865e+12p pd=1.011e+07u as=3.528e+11p ps=3.08e+06u
-M1001 a_306_125# a_53_375# a_222_375# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1002 a_222_375# a_53_375# VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.541e+11p pd=2.89e+06u as=0p ps=0u
-M1003 VPWR D a_222_375# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_222_375# X VNB nshort w=840000u l=150000u
-+  ad=7.077e+11p pd=6.31e+06u as=2.352e+11p ps=2.24e+06u
-M1005 a_222_375# C VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_222_375# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_222_375# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_53_375# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1009 VPWR B a_222_375# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_378_125# B a_306_125# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1011 a_450_125# C a_378_125# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1012 VPWR A_N a_53_375# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1013 VGND D a_450_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_222_375# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VPWR C a_222_375# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_306_125# B a_378_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_222_375# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VPWR a_53_375# a_222_375# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_450_125# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_222_375# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_222_375# a_53_375# a_306_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_222_375# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_53_375# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_378_125# C a_450_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 X a_222_375# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 X a_222_375# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 VGND A_N a_53_375# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_4.cdl b/cells/and4b/sky130_fd_sc_lp__and4b_4.cdl
index 74c400a..6c4ae30 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_4.cdl
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=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 X y VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X y VNB nfet_01v8 m=4 w=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_lp__and4b_4
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_4.netlist.tsv b/cells/and4b/sky130_fd_sc_lp__and4b_4.netlist.tsv
index cf18ec7..3440369 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_4.netlist.tsv
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_4.spice b/cells/and4b/sky130_fd_sc_lp__and4b_4.spice
index 30bdc2a..1020d2c 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_4.spice
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_lp__and4b_4 A_N B C D VGND VNB VPB VPWR X
-M1000 X a_242_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=2.2092e+12p ps=1.646e+07u
-M1001 a_242_23# D VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1002 X a_242_23# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=9.261e+11p ps=7.51e+06u
-M1003 X a_242_23# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_242_23# a_49_133# a_825_49# VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=3.276e+11p ps=2.46e+06u
-M1005 a_717_49# C a_645_49# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=1.764e+11p ps=2.1e+06u
-M1006 VPWR C a_242_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_242_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_242_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_49_133# a_242_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A_N a_49_133# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1011 a_825_49# B a_717_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_645_49# D VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_242_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_242_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_242_23# B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_242_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A_N a_49_133# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
+X0 VPWR B a_242_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND a_242_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_825_49# a_49_133# a_242_23# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 X a_242_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_242_23# a_49_133# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 X a_242_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VGND a_242_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 X a_242_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND D a_645_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_49_133# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VPWR D a_242_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_645_49# C a_717_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_717_49# B a_825_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_49_133# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 X a_242_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VPWR a_242_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 VPWR a_242_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_242_23# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_lp.cdl b/cells/and4b/sky130_fd_sc_lp__and4b_lp.cdl
index aec7a05..63a3361 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_lp.cdl
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_lp.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__and4b_lp 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 y A 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
-MMIP1 X y 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
-MMN3 net60 D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B 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
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C 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
-MMIN1 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D 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
-MI12 net76 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N 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
-MI11 y 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
-MI10 net65 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X y 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
-MI9 net61 C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 net60 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
-MI7 net80 A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI12 net76 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 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
+MI10 net65 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
+MI9 net61 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
+MI7 net80 A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__and4b_lp
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_lp.netlist.tsv b/cells/and4b/sky130_fd_sc_lp__and4b_lp.netlist.tsv
index ef02f7f..385498b 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_lp.netlist.tsv
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_lp.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__and4b_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	net60	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	net80	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	net76	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net76	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	y	A	net65	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net65	B	net61	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net61	C	net60	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net80	A_N	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	y	D	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	net60	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	net80	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	net76	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net76	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	y	A	net65	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net65	B	net61	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net61	C	net60	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net80	A_N	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/and4b/sky130_fd_sc_lp__and4b_lp.spice b/cells/and4b/sky130_fd_sc_lp__and4b_lp.spice
index 05e3717..e21baf5 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_lp.spice
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_lp.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__and4b_lp A_N B C D VGND VNB VPB VPWR X
-M1000 a_276_47# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.457e+11p ps=2.85e+06u
-M1001 a_354_47# C a_276_47# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1002 a_432_47# B a_354_47# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1003 a_480_21# A_N a_708_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1004 VPWR a_84_21# X VPB phighvt w=1e+06u l=250000u
-+  ad=1.14e+12p pd=8.28e+06u as=2.85e+11p ps=2.57e+06u
-M1005 a_480_21# A_N VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1006 a_114_47# a_84_21# X VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1007 VPWR a_480_21# a_84_21# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=5.6e+11p ps=5.12e+06u
-M1008 a_708_47# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR C a_84_21# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_84_21# a_480_21# a_432_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1011 a_84_21# B VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_84_21# a_114_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_84_21# D VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_114_47# a_84_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_84_21# a_114_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 X a_84_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_354_47# B a_432_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_432_47# a_480_21# a_84_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR D a_84_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 VGND A_N a_708_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_276_47# C a_354_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR A_N a_480_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_84_21# a_480_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 a_708_47# A_N a_480_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_84_21# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 VPWR B a_84_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X13 VGND D a_276_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_m.cdl b/cells/and4b/sky130_fd_sc_lp__and4b_m.cdl
index 7484492..20778b4 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_m.cdl
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_m.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__and4b_m 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y 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
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=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 X y VPB pfet_01v8_hvt m=1 w=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 X y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__and4b_m
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_m.netlist.tsv b/cells/and4b/sky130_fd_sc_lp__and4b_m.netlist.tsv
index 302f31b..728d53d 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_m.netlist.tsv
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_m.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__and4b_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	y	VGND	VNB	nshort	1	0.42	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.42	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.42	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	y	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/and4b/sky130_fd_sc_lp__and4b_m.spice b/cells/and4b/sky130_fd_sc_lp__and4b_m.spice
index 83c7a54..fdfb007 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_m.spice
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_m.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__and4b_m A_N B C D VGND VNB VPB VPWR X
-M1000 X a_240_73# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=4.179e+11p ps=4.51e+06u
-M1001 VPWR B a_240_73# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.499e+11p ps=2.87e+06u
-M1002 a_323_73# a_27_55# a_240_73# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1003 a_395_73# B a_323_73# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 a_467_73# C a_395_73# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1005 a_240_73# C VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR D a_240_73# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A_N a_27_55# VNB nshort w=420000u l=150000u
-+  ad=2.751e+11p pd=2.99e+06u as=1.113e+11p ps=1.37e+06u
-M1008 VPWR A_N a_27_55# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1009 VGND D a_467_73# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_240_73# a_27_55# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_240_73# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 a_27_55# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR C a_240_73# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_240_73# a_27_55# a_323_73# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR a_27_55# a_240_73# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_395_73# C a_467_73# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR a_240_73# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_467_73# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_240_73# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VGND a_240_73# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_240_73# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_27_55# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_323_73# B a_395_73# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_1.cdl b/cells/and4bb/sky130_fd_sc_lp__and4bb_1.cdl
index 70c1263..3a8ddaf 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_1.cdl
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_1.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y 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
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=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 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__and4bb_1
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_1.netlist.tsv b/cells/and4bb/sky130_fd_sc_lp__and4bb_1.netlist.tsv
index de2ac89..545513a 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_1.netlist.tsv
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_1.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.42	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.42	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.42	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.42	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.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_1.spice b/cells/and4bb/sky130_fd_sc_lp__and4bb_1.spice
index 24beb05..7dd6117 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_1.spice
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_1.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__and4bb_1 A_N B_N C D VGND VNB VPB VPWR X
-M1000 a_196_51# B_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=3.864e+11p ps=3.83e+06u
-M1001 a_344_131# C VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=7.434e+11p ps=7.52e+06u
-M1002 a_607_131# C a_499_131# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.638e+11p ps=1.62e+06u
-M1003 VPWR A_N a_27_51# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 VPWR a_196_51# a_344_131# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_196_51# B_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 a_344_131# a_27_51# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_499_131# a_196_51# a_427_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1008 VPWR D a_344_131# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A_N a_27_51# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1010 VGND D a_607_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_344_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1012 X a_344_131# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1013 a_427_131# a_27_51# a_344_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 a_27_51# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR B_N a_196_51# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_427_131# a_196_51# a_499_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_607_131# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_344_131# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND B_N a_196_51# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_344_131# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VPWR a_344_131# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_344_131# a_27_51# a_427_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR C a_344_131# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_499_131# C a_607_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_344_131# a_196_51# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 a_27_51# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 VPWR a_27_51# a_344_131# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_2.cdl b/cells/and4bb/sky130_fd_sc_lp__and4bb_2.cdl
index 91448d9..1d34160 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_2.cdl
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_2.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y 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
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=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 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=2 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 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_lp__and4bb_2
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_2.netlist.tsv b/cells/and4bb/sky130_fd_sc_lp__and4bb_2.netlist.tsv
index ad4658d..1151734 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_2.netlist.tsv
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_2.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.42	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.42	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.42	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.42	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.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_2.spice b/cells/and4bb/sky130_fd_sc_lp__and4bb_2.spice
index a6b1a5d..62006f9 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_2.spice
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__and4bb_2 A_N B_N C D VGND VNB VPB VPWR X
-M1000 VPWR D a_185_23# VPB phighvt w=420000u l=150000u
-+  ad=1.218e+12p pd=1.04e+07u as=2.499e+11p ps=2.87e+06u
-M1001 a_696_125# C a_588_125# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.638e+11p ps=1.62e+06u
-M1002 a_185_23# C VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_185_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1004 VPWR a_558_99# a_185_23# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_558_99# B_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=6.552e+11p ps=6.26e+06u
-M1006 X a_185_23# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1007 a_558_99# B_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1008 a_185_23# a_27_133# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A_N a_27_133# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1010 VGND a_185_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_588_125# a_558_99# a_516_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1012 VPWR a_185_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A_N a_27_133# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1014 VGND D a_696_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_516_125# a_27_133# a_185_23# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 a_185_23# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_27_133# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_516_125# a_558_99# a_588_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR B_N a_558_99# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_696_125# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR C a_185_23# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_27_133# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_185_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_185_23# a_27_133# a_516_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR a_27_133# a_185_23# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 VGND a_185_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_588_125# C a_696_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 X a_185_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VGND B_N a_558_99# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 X a_185_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_185_23# a_558_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_4.cdl b/cells/and4bb/sky130_fd_sc_lp__and4bb_4.cdl
index 82cb81e..416f17e 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_4.cdl
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_4.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__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=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y A VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y B VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=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 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=4 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=4 w=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_lp__and4bb_4
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_4.netlist.tsv b/cells/and4bb/sky130_fd_sc_lp__and4bb_4.netlist.tsv
index 99068f7..68c01b0 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_4.netlist.tsv
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_4.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__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	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.84	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_4.spice b/cells/and4bb/sky130_fd_sc_lp__and4bb_4.spice
index 10b9abe..7e4add8 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_4.spice
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_4.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__and4bb_4 A_N B_N C D VGND VNB VPB VPWR X
-M1000 VPWR C a_254_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.2365e+12p pd=1.675e+07u as=8.442e+11p ps=6.38e+06u
-M1001 VGND B_N a_49_131# VNB nshort w=420000u l=150000u
-+  ad=1.1214e+12p pd=9.14e+06u as=1.197e+11p ps=1.41e+06u
-M1002 a_929_21# A_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1003 a_671_47# D VGND VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1004 X a_254_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1005 a_743_47# C a_671_47# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=0p ps=0u
-M1006 X a_254_21# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1007 X a_254_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_254_21# a_49_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_254_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_851_47# a_49_131# a_743_47# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=0p ps=0u
-M1011 a_254_21# D VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR B_N a_49_131# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1013 VGND a_254_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_254_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_254_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_929_21# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1017 X a_254_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_929_21# a_254_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_254_21# a_929_21# a_851_47# VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
+X0 VGND D a_671_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 X a_254_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_851_47# a_929_21# a_254_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_254_21# a_929_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND a_254_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPWR D a_254_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 X a_254_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_49_131# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_49_131# a_254_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_254_21# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_49_131# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 VPWR a_254_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VGND a_254_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 X a_254_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 VPWR A_N a_929_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 a_671_47# C a_743_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_743_47# a_49_131# a_851_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 VPWR a_254_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 X a_254_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VGND A_N a_929_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.cdl b/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.cdl
index 963fd85..51c3685 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.cdl
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.cdl
@@ -16,38 +16,38 @@
 
 .SUBCKT sky130_fd_sc_lp__and4bb_lp 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 y A 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
-MMIP1 B B_N VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP1 y B 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 y 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
-MMN2 net83 C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C 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
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y D 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
-MMIN1 B B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N 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
-MMIN2 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 B B_N 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
-MI12 net84 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 X y 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
-MI7 net80 A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 net83 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
-MI13 y 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
-MI10 net72 D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net87 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net64 B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI12 net84 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
+MI7 net80 A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI13 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
+MI10 net72 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
+MI9 net87 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net64 B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__and4bb_lp
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.netlist.tsv b/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.netlist.tsv
index 12e7651..5d18e4a 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.netlist.tsv
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.netlist.tsv
@@ -1,19 +1,19 @@
 sky130_fd_sc_lp__and4bb_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	net83	C	net72	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	net80	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	net64	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	net87	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net84	B	net83	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net80	A_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	y	A	net84	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net72	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net87	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net64	B_N	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	y	B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	y	C	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	y	D	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	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.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	net83	C	net72	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	net80	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	net64	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	net87	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net84	B	net83	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net80	A_N	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	y	A	net84	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net72	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net87	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net64	B_N	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/and4bb/sky130_fd_sc_lp__and4bb_lp.spice b/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.spice
index 0fa78b9..66d0de8 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.spice
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.spice
@@ -16,38 +16,21 @@
 
 
 .subckt sky130_fd_sc_lp__and4bb_lp A_N B_N C D VGND VNB VPB VPWR X
-M1000 X a_461_47# a_896_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VPWR D a_461_47# VPB phighvt w=1e+06u l=250000u
-+  ad=1.31e+12p pd=1.062e+07u as=5.6e+11p ps=5.12e+06u
-M1002 VGND A_N a_114_51# VNB nshort w=420000u l=150000u
-+  ad=2.94e+11p pd=3.08e+06u as=8.82e+10p ps=1.26e+06u
-M1003 VPWR B_N a_291_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1004 a_461_47# C VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_291_409# a_461_47# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_626_47# a_291_409# a_548_47# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.008e+11p ps=1.32e+06u
-M1007 a_704_47# C a_626_47# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1008 VGND D a_704_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_114_51# A_N a_27_51# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1010 a_272_51# B_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1011 a_291_409# B_N a_272_51# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1012 VPWR A_N a_27_51# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1013 a_461_47# a_27_51# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_548_47# a_27_51# a_461_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1015 X a_461_47# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1016 a_896_47# a_461_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_291_409# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_461_47# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_896_47# a_461_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_704_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR C a_461_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_272_51# B_N a_291_409# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_461_47# a_896_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_626_47# C a_704_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_461_47# a_291_409# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 VPWR a_27_51# a_461_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 a_114_51# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_27_51# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 a_461_47# a_27_51# a_548_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_27_51# A_N a_114_51# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VGND B_N a_272_51# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VPWR a_461_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X16 a_548_47# a_291_409# a_626_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_m.cdl b/cells/and4bb/sky130_fd_sc_lp__and4bb_m.cdl
index 48dba22..ecd103d 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_m.cdl
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_m.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__and4bb_m 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 y 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
-MMP1 y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 y 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
-MMP2 y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 y C VPB pfet_01v8_hvt m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 y 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
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=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 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=1 w=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 B B_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__and4bb_m
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_m.netlist.tsv b/cells/and4bb/sky130_fd_sc_lp__and4bb_m.netlist.tsv
index 927b648..ff77e69 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_m.netlist.tsv
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_m.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__and4bb_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	y	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	y	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	1	0.42	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.42	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.42	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.42	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	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/and4bb/sky130_fd_sc_lp__and4bb_m.spice b/cells/and4bb/sky130_fd_sc_lp__and4bb_m.spice
index 9b34825..b2c7076 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_m.spice
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_m.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__and4bb_m A_N B_N C D VGND VNB VPB VPWR X
-M1000 VGND A_N a_54_55# VNB nshort w=420000u l=150000u
-+  ad=3.003e+11p pd=3.11e+06u as=1.113e+11p ps=1.37e+06u
-M1001 a_223_55# B_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1002 VGND D a_595_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1003 VPWR a_223_55# a_332_125# VPB phighvt w=420000u l=150000u
-+  ad=4.809e+11p pd=5.65e+06u as=2.352e+11p ps=2.8e+06u
-M1004 a_415_125# a_54_55# a_332_125# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1005 X a_332_125# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 a_595_125# C a_487_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.638e+11p ps=1.62e+06u
-M1007 VPWR D a_332_125# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_332_125# a_54_55# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_332_125# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1010 VPWR A_N a_54_55# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1011 a_332_125# C VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_223_55# B_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1013 a_487_125# a_223_55# a_415_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_332_125# a_223_55# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_332_125# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VPWR B_N a_223_55# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_54_55# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_415_125# a_223_55# a_487_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_595_125# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_332_125# a_54_55# a_415_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_332_125# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_54_55# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_487_125# C a_595_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VPWR a_54_55# a_332_125# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 VPWR a_332_125# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 VGND B_N a_223_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VPWR C a_332_125# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_lp__buf_0.cdl b/cells/buf/sky130_fd_sc_lp__buf_0.cdl
index 6b8a897..da1d5ce 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_0.cdl
+++ b/cells/buf/sky130_fd_sc_lp__buf_0.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__buf_0 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort 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.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 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
-MMIP2 X Ab 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
+MMIP1 Ab 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
+MMIP2 X Ab 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_lp__buf_0
diff --git a/cells/buf/sky130_fd_sc_lp__buf_0.netlist.tsv b/cells/buf/sky130_fd_sc_lp__buf_0.netlist.tsv
index 49c7210..941f73e 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_0.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_lp__buf_0.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__buf_0	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	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.42	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.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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_lp__buf_0.spice b/cells/buf/sky130_fd_sc_lp__buf_0.spice
index 49faa60..fbd03fc 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_0.spice
+++ b/cells/buf/sky130_fd_sc_lp__buf_0.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__buf_0 A VGND VNB VPB VPWR X
-M1000 a_70_157# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.428e+11p ps=1.52e+06u
-M1001 VPWR a_70_157# X VPB phighvt w=640000u l=150000u
-+  ad=2.011e+11p pd=1.96e+06u as=1.696e+11p ps=1.81e+06u
-M1002 a_70_157# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1003 VGND a_70_157# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 X a_70_157# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_70_157# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 VPWR A a_70_157# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VGND A a_70_157# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_lp__buf_1.cdl b/cells/buf/sky130_fd_sc_lp__buf_1.cdl
index 5dbe2b4..182c56e 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_1.cdl
+++ b/cells/buf/sky130_fd_sc_lp__buf_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A 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
-MMIP2 X Ab VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=0.64 l=0.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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__buf_1
diff --git a/cells/buf/sky130_fd_sc_lp__buf_1.netlist.tsv b/cells/buf/sky130_fd_sc_lp__buf_1.netlist.tsv
index 629a5ff..fb82b46 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_1.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_lp__buf_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	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.84	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_lp__buf_1.spice b/cells/buf/sky130_fd_sc_lp__buf_1.spice
index 0d7529c..e39a9f0 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_1.spice
+++ b/cells/buf/sky130_fd_sc_lp__buf_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__buf_1 A VGND VNB VPB VPWR X
-M1000 a_70_237# A VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=3.819e+11p ps=3.2e+06u
-M1001 VGND a_70_237# X VNB nshort w=840000u l=150000u
-+  ad=2.541e+11p pd=2.36e+06u as=2.226e+11p ps=2.21e+06u
-M1002 a_70_237# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1003 VPWR a_70_237# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 VPWR A a_70_237# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 X a_70_237# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 X a_70_237# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND A a_70_237# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_lp__buf_16.cdl b/cells/buf/sky130_fd_sc_lp__buf_16.cdl
index d4c4318..a2f8484 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_16.cdl
+++ b/cells/buf/sky130_fd_sc_lp__buf_16.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=6 w=0.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab VNB nfet_01v8 m=16 w=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 Ab A VPB phighvt m=6 w=1.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__buf_16
diff --git a/cells/buf/sky130_fd_sc_lp__buf_16.netlist.tsv b/cells/buf/sky130_fd_sc_lp__buf_16.netlist.tsv
index 2fb0fcb..3256484 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_16.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_lp__buf_16.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	16	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	6	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	16	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	6	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8	16	0.84	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_lp__buf_16.spice b/cells/buf/sky130_fd_sc_lp__buf_16.spice
index 320e718..191df92 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_16.spice
+++ b/cells/buf/sky130_fd_sc_lp__buf_16.spice
@@ -16,92 +16,48 @@
 
 
 .subckt sky130_fd_sc_lp__buf_16 A VGND VNB VPB VPWR X
-M1000 a_130_47# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0584e+12p pd=9.24e+06u as=4.1958e+12p ps=3.69e+07u
-M1001 X a_130_47# VGND VNB nshort w=840000u l=150000u
-+  ad=1.8816e+12p pd=1.792e+07u as=2.7972e+12p ps=2.682e+07u
-M1002 VPWR a_130_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=2.8224e+12p ps=2.464e+07u
-M1003 VGND a_130_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_130_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A a_130_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.72e+06u
-M1006 VPWR a_130_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_130_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_130_47# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A a_130_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_130_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_130_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_130_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_130_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_130_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_130_47# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_130_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_130_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_130_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_130_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_130_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR A a_130_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_130_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_130_47# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_130_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X a_130_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 X a_130_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_130_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_130_47# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_130_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 X a_130_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 X a_130_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 X a_130_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR A a_130_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 X a_130_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND a_130_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND A a_130_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 X a_130_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR a_130_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_130_47# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VPWR A a_130_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 X a_130_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 X a_130_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 X a_130_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_130_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 X a_130_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR A a_130_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND a_130_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 X a_130_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 X a_130_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 X a_130_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VGND a_130_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VPWR a_130_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR A a_130_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VGND a_130_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VPWR A a_130_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 X a_130_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 X a_130_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VGND a_130_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VPWR a_130_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 X a_130_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_130_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 X a_130_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VPWR a_130_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 VGND A a_130_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 a_130_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 X a_130_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 X a_130_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 VPWR a_130_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 VPWR a_130_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 X a_130_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 X a_130_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X28 VGND A a_130_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 a_130_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 X a_130_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 VPWR a_130_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X32 a_130_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X33 VGND A a_130_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X34 X a_130_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X35 a_130_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X36 VPWR a_130_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X37 VGND a_130_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X38 X a_130_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X39 VGND a_130_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X40 VPWR a_130_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X41 X a_130_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X42 VGND a_130_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X43 VGND a_130_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_lp__buf_2.cdl b/cells/buf/sky130_fd_sc_lp__buf_2.cdl
index beaf41b..2030687 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_2.cdl
+++ b/cells/buf/sky130_fd_sc_lp__buf_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab VNB nfet_01v8 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 Ab A 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
-MMIP2 X Ab VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=0.64 l=0.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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__buf_2
diff --git a/cells/buf/sky130_fd_sc_lp__buf_2.netlist.tsv b/cells/buf/sky130_fd_sc_lp__buf_2.netlist.tsv
index 3d58722..b857373 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_2.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_lp__buf_2.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	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	2	0.84	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_lp__buf_2.spice b/cells/buf/sky130_fd_sc_lp__buf_2.spice
index 5dac2de..3a5c5de 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_2.spice
+++ b/cells/buf/sky130_fd_sc_lp__buf_2.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__buf_2 A VGND VNB VPB VPWR X
-M1000 X a_90_21# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=6.405e+11p ps=5.35e+06u
-M1001 X a_90_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=9.832e+11p ps=6.95e+06u
-M1002 a_90_21# A VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1003 VGND a_90_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_90_21# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1005 VPWR a_90_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_90_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VPWR a_90_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 X a_90_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 X a_90_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR A a_90_21# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 VGND A a_90_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_lp__buf_4.cdl b/cells/buf/sky130_fd_sc_lp__buf_4.cdl
index 6f54895..d5f2976 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_4.cdl
+++ b/cells/buf/sky130_fd_sc_lp__buf_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab VNB nfet_01v8 m=4 w=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 Ab A VPB phighvt m=1 w=1.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__buf_4
diff --git a/cells/buf/sky130_fd_sc_lp__buf_4.netlist.tsv b/cells/buf/sky130_fd_sc_lp__buf_4.netlist.tsv
index a6dc1dc..2c3af02 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_4.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_lp__buf_4.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8	4	0.84	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_lp__buf_4.spice b/cells/buf/sky130_fd_sc_lp__buf_4.spice
index fa5ce08..95d17cc 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_4.spice
+++ b/cells/buf/sky130_fd_sc_lp__buf_4.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__buf_4 A VGND VNB VPB VPWR X
-M1000 a_122_23# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=1.0647e+12p ps=9.25e+06u
-M1001 a_122_23# A VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=6.93e+11p ps=6.69e+06u
-M1002 VGND a_122_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1003 X a_122_23# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR a_122_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1005 VPWR a_122_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_122_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_122_23# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_122_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_122_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_122_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND a_122_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 X a_122_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VPWR a_122_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND a_122_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND A a_122_23# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 X a_122_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VPWR A a_122_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR a_122_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 X a_122_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_lp__buf_8.cdl b/cells/buf/sky130_fd_sc_lp__buf_8.cdl
index ee6b878..bd78b40 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_8.cdl
+++ b/cells/buf/sky130_fd_sc_lp__buf_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=3 w=0.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab VNB nfet_01v8 m=8 w=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 Ab A VPB phighvt m=3 w=1.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__buf_8
diff --git a/cells/buf/sky130_fd_sc_lp__buf_8.netlist.tsv b/cells/buf/sky130_fd_sc_lp__buf_8.netlist.tsv
index 25b06fe..b60896e 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_8.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_lp__buf_8.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	3	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	3	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	VGND	VNB	nfet_01v8	8	0.84	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_lp__buf_8.spice b/cells/buf/sky130_fd_sc_lp__buf_8.spice
index f637a92..e960a5e 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_8.spice
+++ b/cells/buf/sky130_fd_sc_lp__buf_8.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_lp__buf_8 A VGND VNB VPB VPWR X
-M1000 VPWR A a_27_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.1231e+12p pd=1.849e+07u as=6.867e+11p ps=6.13e+06u
-M1001 X a_27_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=0p ps=0u
-M1002 VGND a_27_47# X VNB nshort w=840000u l=150000u
-+  ad=1.4154e+12p pd=1.345e+07u as=9.408e+11p ps=8.96e+06u
-M1003 VPWR a_27_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 X a_27_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_27_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.578e+11p ps=4.45e+06u
-M1007 a_27_47# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_27_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_27_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_27_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_27_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_27_47# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_27_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_27_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_27_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_27_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_27_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_27_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_27_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A a_27_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR A a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 VGND A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_lp__buf_lp.cdl b/cells/buf/sky130_fd_sc_lp__buf_lp.cdl
index 137cf1f..e634022 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_lp.cdl
+++ b/cells/buf/sky130_fd_sc_lp__buf_lp.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__buf_lp 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net42 Ab VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI5 net42 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 X Ab VNB nshort 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 net34 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI4 net34 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A 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 l=0.25 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 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 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_lp__buf_lp
diff --git a/cells/buf/sky130_fd_sc_lp__buf_lp.netlist.tsv b/cells/buf/sky130_fd_sc_lp__buf_lp.netlist.tsv
index d5242ef..b739018 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_lp.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_lp__buf_lp.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__buf_lp	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	net34	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net42	Ab	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	net42	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	net34	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	net34	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net42	Ab	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	net42	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	net34	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	A	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_lp__buf_lp.spice b/cells/buf/sky130_fd_sc_lp__buf_lp.spice
index ff4f447..83955d2 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_lp.spice
+++ b/cells/buf/sky130_fd_sc_lp__buf_lp.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__buf_lp A VGND VNB VPB VPWR X
-M1000 a_124_57# a_94_31# X VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1001 a_94_31# A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=5.25e+11p ps=3.05e+06u
-M1002 a_312_57# A VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.806e+11p ps=1.7e+06u
-M1003 a_94_31# A a_312_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1004 VPWR a_94_31# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1005 VGND a_94_31# a_124_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A a_312_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR A a_94_31# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_124_57# a_94_31# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 X a_94_31# a_124_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_312_57# A a_94_31# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_94_31# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/buf/sky130_fd_sc_lp__buf_m.cdl b/cells/buf/sky130_fd_sc_lp__buf_m.cdl
index 1909d18..af6e7c6 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_m.cdl
+++ b/cells/buf/sky130_fd_sc_lp__buf_m.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__buf_m 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort 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.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 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
-MMIP2 X Ab VPB phighvt m=1 w=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 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
+MMIP2 X Ab VPB pfet_01v8_hvt m=1 w=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_lp__buf_m
diff --git a/cells/buf/sky130_fd_sc_lp__buf_m.netlist.tsv b/cells/buf/sky130_fd_sc_lp__buf_m.netlist.tsv
index 97dbbaeb..a1a1e07 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_m.netlist.tsv
+++ b/cells/buf/sky130_fd_sc_lp__buf_m.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__buf_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	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.42	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.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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buf/sky130_fd_sc_lp__buf_m.spice b/cells/buf/sky130_fd_sc_lp__buf_m.spice
index 52fc167..0458096 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_m.spice
+++ b/cells/buf/sky130_fd_sc_lp__buf_m.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__buf_m A VGND VNB VPB VPWR X
-M1000 VGND a_47_178# X VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.113e+11p ps=1.37e+06u
-M1001 a_47_178# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.176e+11p ps=1.4e+06u
-M1002 a_47_178# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1003 VPWR a_47_178# X VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 X a_47_178# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_47_178# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VGND A a_47_178# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR A a_47_178# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.cdl b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.cdl
index ba8b989..3ca33af 100644
--- a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.cdl
+++ b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Abb Ab VNB nshort m=3 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 Abb Ab VNB nfet_01v8 m=3 w=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 Abbb Abb VNB nshort m=6 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 Abbb Abb VNB nfet_01v8 m=6 w=0.84 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.84 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.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 Abbb VPB phighvt m=16 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__bufbuf_16
diff --git a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.netlist.tsv b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.netlist.tsv
index a1cf188..94cb06e 100644
--- a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.netlist.tsv
+++ b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Abb	Ab	VGND	VNB	nshort	3	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	Abbb	Abb	VGND	VNB	nshort	6	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	Abbb	VGND	VNB	nshort	16	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	Abbb	VPWR	VPB	phighvt	16	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Abb	Ab	VPWR	VPB	phighvt	3	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	Abbb	Abb	VPWR	VPB	phighvt	6	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	3	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	Abbb	Abb	VGND	VNB	nfet_01v8	6	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	Abbb	VGND	VNB	nfet_01v8	16	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.spice b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.spice
index 15c1ee1..b308aec 100644
--- a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.spice
+++ b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.spice
@@ -16,108 +16,56 @@
 
 
 .subckt sky130_fd_sc_lp__bufbuf_16 A VGND VNB VPB VPWR X
-M1000 X a_610_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.8224e+12p pd=2.464e+07u as=4.9014e+12p ps=4.306e+07u
-M1001 VPWR a_27_49# a_196_49# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=6.867e+11p ps=6.13e+06u
-M1002 X a_610_47# VGND VNB nshort w=840000u l=150000u
-+  ad=1.8816e+12p pd=1.792e+07u as=3.2676e+12p ps=3.13e+07u
-M1003 a_610_47# a_196_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0584e+12p pd=9.24e+06u as=0p ps=0u
-M1004 X a_610_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_610_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_610_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_610_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_196_49# a_610_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.72e+06u
-M1009 VGND a_610_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_610_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_196_49# a_610_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_610_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_610_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_610_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_610_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_610_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_610_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A a_27_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1019 a_610_47# a_196_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_610_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_610_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_196_49# a_27_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_610_47# a_196_49# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_610_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_196_49# a_610_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_610_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_196_49# a_27_49# VGND VNB nshort w=840000u l=150000u
-+  ad=4.578e+11p pd=4.45e+06u as=0p ps=0u
-M1028 X a_610_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_610_47# a_196_49# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 X a_610_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 X a_610_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_196_49# a_27_49# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_610_47# a_196_49# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 X a_610_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND a_196_49# a_610_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR a_610_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 X a_610_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND a_610_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_196_49# a_27_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_610_47# a_196_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VPWR a_196_49# a_610_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VPWR a_196_49# a_610_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 X a_610_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VGND a_610_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 X a_610_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 X a_610_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 X a_610_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 VGND a_27_49# a_196_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 X a_610_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 VPWR a_610_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 VPWR A a_27_49# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 X a_610_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR a_610_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR a_610_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND a_27_49# a_196_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_610_47# a_196_49# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_27_49# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_610_47# a_196_49# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VPWR a_27_49# a_196_49# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND a_196_49# a_610_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VGND a_610_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 X a_610_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 X a_610_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VPWR a_610_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 X a_610_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 VPWR a_610_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VPWR a_610_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 X a_610_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 VGND a_610_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 VPWR a_610_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 X a_610_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 a_610_47# a_196_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 X a_610_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 X a_610_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_27_49# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 VPWR a_196_49# a_610_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 VGND a_610_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 X a_610_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 a_196_49# a_27_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 VPWR a_27_49# a_196_49# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 a_610_47# a_196_49# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X30 VGND a_610_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X31 X a_610_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X32 VPWR a_610_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X33 X a_610_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X34 X a_610_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X35 VGND a_196_49# a_610_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X36 X a_610_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X37 a_610_47# a_196_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X38 VGND a_610_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X39 VPWR a_196_49# a_610_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X40 VGND a_610_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X41 VGND a_610_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X42 X a_610_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X43 X a_610_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X44 VGND a_27_49# a_196_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X45 a_610_47# a_196_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X46 a_196_49# a_27_49# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X47 VPWR a_196_49# a_610_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X48 VPWR a_610_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X49 VGND a_610_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X50 VGND a_196_49# a_610_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X51 X a_610_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.cdl b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.cdl
index 40cd562..3b01fe6 100644
--- a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.cdl
+++ b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Abb Ab VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 Abb Ab VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 Abbb Abb VNB nshort m=3 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 Abbb Abb VNB nfet_01v8 m=3 w=0.84 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.84 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.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 Abbb VPB phighvt m=8 w=1.26 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.64 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=0.64 l=0.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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__bufbuf_8
diff --git a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.netlist.tsv b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.netlist.tsv
index 5c1cf5d..5c01940 100644
--- a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.netlist.tsv
+++ b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Abb	Ab	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	Abbb	Abb	VGND	VNB	nshort	3	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	Abbb	VGND	VNB	nshort	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	Abbb	VPWR	VPB	phighvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	Abbb	Abb	VPWR	VPB	phighvt	3	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	Abbb	Abb	VGND	VNB	nfet_01v8	3	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	Abbb	VGND	VNB	nfet_01v8	8	0.84	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.26	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.64	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.spice b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.spice
index 001c5c1..c3963d6 100644
--- a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.spice
+++ b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_lp__bufbuf_8 A VGND VNB VPB VPWR X
-M1000 a_117_265# a_837_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.867e+11p pd=6.13e+06u as=2.5841e+12p ps=2.185e+07u
-M1001 X a_117_265# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=0p ps=0u
-M1002 VGND a_117_265# X VNB nshort w=840000u l=150000u
-+  ad=1.722e+12p pd=1.601e+07u as=9.408e+11p ps=8.96e+06u
-M1003 VPWR a_117_265# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_117_265# a_837_23# VGND VNB nshort w=840000u l=150000u
-+  ad=4.578e+11p pd=4.45e+06u as=0p ps=0u
-M1005 a_1217_23# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 X a_117_265# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_1217_23# a_837_23# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.25e+06u
-M1008 X a_117_265# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_117_265# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_117_265# a_837_23# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1217_23# A VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1012 X a_117_265# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_117_265# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_837_23# a_117_265# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_117_265# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_117_265# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_117_265# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_837_23# a_117_265# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_1217_23# a_837_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1020 VGND a_117_265# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_117_265# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_117_265# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR a_117_265# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_117_265# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_117_265# a_837_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_1217_23# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 VGND a_117_265# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 X a_117_265# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 X a_117_265# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 X a_117_265# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND a_117_265# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_837_23# a_1217_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VPWR a_117_265# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND a_117_265# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VPWR a_117_265# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 X a_117_265# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 X a_117_265# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_837_23# a_1217_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VPWR a_837_23# a_117_265# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VPWR a_837_23# a_117_265# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VPWR a_117_265# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 VPWR a_117_265# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 X a_117_265# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VGND A a_1217_23# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VGND a_837_23# a_117_265# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 VGND a_837_23# a_117_265# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 a_117_265# a_837_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 a_117_265# a_837_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 X a_117_265# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 VGND a_117_265# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 X a_117_265# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/bufinv/sky130_fd_sc_lp__bufinv_16.cdl b/cells/bufinv/sky130_fd_sc_lp__bufinv_16.cdl
index 85c627c..34d3403 100644
--- a/cells/bufinv/sky130_fd_sc_lp__bufinv_16.cdl
+++ b/cells/bufinv/sky130_fd_sc_lp__bufinv_16.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=3 w=0.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 Abb Ab VNB nfet_01v8 m=6 w=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 Y Abb VNB nshort m=16 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 Y Abb VNB nfet_01v8 m=16 w=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 Ab A VPB phighvt m=3 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__bufinv_16
diff --git a/cells/bufinv/sky130_fd_sc_lp__bufinv_16.netlist.tsv b/cells/bufinv/sky130_fd_sc_lp__bufinv_16.netlist.tsv
index 93a52f0..4104491 100644
--- a/cells/bufinv/sky130_fd_sc_lp__bufinv_16.netlist.tsv
+++ b/cells/bufinv/sky130_fd_sc_lp__bufinv_16.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Abb	Ab	VGND	VNB	nshort	6	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	Y	Abb	VGND	VNB	nshort	16	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	3	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Abb	Ab	VPWR	VPB	phighvt	6	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	Y	Abb	VPWR	VPB	phighvt	16	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	3	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	6	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	Y	Abb	VGND	VNB	nfet_01v8	16	0.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/bufinv/sky130_fd_sc_lp__bufinv_16.spice b/cells/bufinv/sky130_fd_sc_lp__bufinv_16.spice
index 268251a..8371e8c 100644
--- a/cells/bufinv/sky130_fd_sc_lp__bufinv_16.spice
+++ b/cells/bufinv/sky130_fd_sc_lp__bufinv_16.spice
@@ -16,104 +16,54 @@
 
 
 .subckt sky130_fd_sc_lp__bufinv_16 A VGND VNB VPB VPWR Y
-M1000 Y a_413_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.8224e+12p pd=2.464e+07u as=4.6242e+12p ps=4.01e+07u
-M1001 VGND a_63_49# a_413_49# VNB nshort w=840000u l=150000u
-+  ad=3.0828e+12p pd=2.918e+07u as=7.056e+11p ps=6.72e+06u
-M1002 VGND a_413_49# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=1.8816e+12p ps=1.792e+07u
-M1003 VGND a_413_49# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_413_49# a_63_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0584e+12p pd=9.24e+06u as=0p ps=0u
-M1005 VGND a_63_49# a_413_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_63_49# A VGND VNB nshort w=840000u l=150000u
-+  ad=4.578e+11p pd=4.45e+06u as=0p ps=0u
-M1007 VPWR a_413_49# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_63_49# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.867e+11p pd=6.13e+06u as=0p ps=0u
-M1009 Y a_413_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_63_49# a_413_49# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y a_413_49# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_413_49# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y a_413_49# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y a_413_49# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y a_413_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_413_49# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A a_63_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_413_49# a_63_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y a_413_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_63_49# a_413_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_413_49# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A a_63_49# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND a_413_49# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y a_413_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y a_413_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR A a_63_49# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y a_413_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR a_413_49# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_413_49# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND a_413_49# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND a_413_49# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND a_413_49# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_413_49# a_63_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR a_413_49# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_413_49# a_63_49# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Y a_413_49# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_413_49# a_63_49# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Y a_413_49# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_413_49# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VGND A a_63_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_413_49# a_63_49# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VPWR a_63_49# a_413_49# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VPWR a_413_49# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 Y a_413_49# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 Y a_413_49# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 Y a_413_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VPWR a_413_49# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 Y a_413_49# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VPWR a_63_49# a_413_49# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_413_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_413_49# a_63_49# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_413_49# a_63_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND a_413_49# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 Y a_413_49# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPWR a_63_49# a_413_49# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND a_413_49# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_63_49# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 Y a_413_49# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VGND a_413_49# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 Y a_413_49# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 Y a_413_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 Y a_413_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 Y a_413_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VPWR a_413_49# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VGND a_63_49# a_413_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 Y a_413_49# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 VPWR a_63_49# a_413_49# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 a_413_49# a_63_49# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 Y a_413_49# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 VGND a_413_49# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 VGND a_413_49# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 a_63_49# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 Y a_413_49# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 VPWR a_413_49# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 VGND a_413_49# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 Y a_413_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 Y a_413_49# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X28 VPWR a_413_49# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 a_63_49# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X30 VGND a_413_49# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X31 VPWR a_63_49# a_413_49# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X32 Y a_413_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X33 VPWR a_413_49# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X34 a_413_49# a_63_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X35 VPWR A a_63_49# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X36 VGND a_63_49# a_413_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X37 VPWR a_413_49# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X38 VPWR a_413_49# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X39 Y a_413_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X40 a_63_49# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X41 VGND a_413_49# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X42 VGND A a_63_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X43 a_413_49# a_63_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X44 a_413_49# a_63_49# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X45 VPWR a_413_49# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X46 VPWR a_413_49# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X47 Y a_413_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X48 VGND a_63_49# a_413_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X49 Y a_413_49# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/bufinv/sky130_fd_sc_lp__bufinv_8.cdl b/cells/bufinv/sky130_fd_sc_lp__bufinv_8.cdl
index c115ae1..36e9eba 100644
--- a/cells/bufinv/sky130_fd_sc_lp__bufinv_8.cdl
+++ b/cells/bufinv/sky130_fd_sc_lp__bufinv_8.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 Abb Ab VNB nshort m=3 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 Abb Ab VNB nfet_01v8 m=3 w=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 Y Abb VNB nshort m=8 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 Y Abb VNB nfet_01v8 m=8 w=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 Ab A VPB phighvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__bufinv_8
diff --git a/cells/bufinv/sky130_fd_sc_lp__bufinv_8.netlist.tsv b/cells/bufinv/sky130_fd_sc_lp__bufinv_8.netlist.tsv
index c14d542..58155b1 100644
--- a/cells/bufinv/sky130_fd_sc_lp__bufinv_8.netlist.tsv
+++ b/cells/bufinv/sky130_fd_sc_lp__bufinv_8.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	Abb	Ab	VGND	VNB	nshort	3	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	Y	Abb	VGND	VNB	nshort	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	Abb	Ab	VPWR	VPB	phighvt	3	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	Y	Abb	VPWR	VPB	phighvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	Abb	Ab	VGND	VNB	nfet_01v8	3	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	Y	Abb	VGND	VNB	nfet_01v8	8	0.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/bufinv/sky130_fd_sc_lp__bufinv_8.spice b/cells/bufinv/sky130_fd_sc_lp__bufinv_8.spice
index d6de96a..b12a802 100644
--- a/cells/bufinv/sky130_fd_sc_lp__bufinv_8.spice
+++ b/cells/bufinv/sky130_fd_sc_lp__bufinv_8.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_lp__bufinv_8 A VGND VNB VPB VPWR Y
-M1000 Y a_82_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=2.4318e+12p ps=2.15e+07u
-M1001 VPWR a_876_23# a_82_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=6.867e+11p ps=6.13e+06u
-M1002 a_82_23# a_876_23# VGND VNB nshort w=840000u l=150000u
-+  ad=4.662e+11p pd=4.47e+06u as=1.6212e+12p ps=1.562e+07u
-M1003 Y a_82_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_82_23# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=9.408e+11p ps=8.96e+06u
-M1005 Y a_82_23# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_82_23# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y a_82_23# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_876_23# a_82_23# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_82_23# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_82_23# a_876_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_82_23# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_876_23# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1013 VGND a_82_23# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_82_23# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_876_23# a_82_23# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y a_82_23# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_82_23# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_876_23# A VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1019 Y a_82_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y a_82_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_876_23# a_82_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y a_82_23# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND a_82_23# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_82_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 Y a_82_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_82_23# a_876_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VGND a_82_23# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND A a_876_23# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 Y a_82_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Y a_82_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VGND a_82_23# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_82_23# a_876_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VGND a_876_23# a_82_23# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 Y a_82_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VPWR a_82_23# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VPWR a_82_23# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_82_23# a_876_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VGND a_82_23# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VPWR a_82_23# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_82_23# a_876_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 VGND a_82_23# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 Y a_82_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 VPWR A a_876_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 VPWR a_82_23# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 Y a_82_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 Y a_82_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 VPWR a_876_23# a_82_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.cdl b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.cdl
index a31655d..b4c548d 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.cdl
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__bufkapwr_1 A KAPWR VGND VNB VPB VPWR X
 *.PININFO A:I KAPWR: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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__bufkapwr_1
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.netlist.tsv b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.netlist.tsv
index 28bfbcb..80742be 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.netlist.tsv
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__bufkapwr_1	A:I KAPWR: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	KAPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	KAPWR	VPB	phighvt	1	1.26	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	KAPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	KAPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.spice b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.spice
index 19ed232..68e4272 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.spice
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__bufkapwr_1 A KAPWR VGND VNB VPB VPWR X
-M1000 a_69_161# A KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=3.528e+11p ps=3.08e+06u
-M1001 VGND a_69_161# X VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=1.113e+11p ps=1.37e+06u
-M1002 a_69_161# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1003 KAPWR a_69_161# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 VGND A a_69_161# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 KAPWR A a_69_161# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 X a_69_161# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 X a_69_161# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.cdl b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.cdl
index 1d41a8c..b071890 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.cdl
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__bufkapwr_2 A KAPWR VGND VNB VPB VPWR X
 *.PININFO A:I KAPWR: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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__bufkapwr_2
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.netlist.tsv b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.netlist.tsv
index 98ba2e0..94a7805 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.netlist.tsv
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__bufkapwr_2	A:I KAPWR: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	KAPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	KAPWR	VPB	phighvt	2	1.26	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	KAPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	KAPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.spice b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.spice
index 4f2c2d9..3167dd2 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.spice
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__bufkapwr_2 A KAPWR VGND VNB VPB VPWR X
-M1000 KAPWR a_27_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.497e+11p pd=6.23e+06u as=3.528e+11p ps=3.08e+06u
-M1001 X a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.52e+11p ps=2.88e+06u
-M1002 VGND A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1003 X a_27_47# KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_27_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 KAPWR A a_27_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 KAPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 X a_27_47# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_27_47# A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.cdl b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.cdl
index cbfdc76..49597b1 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.cdl
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__bufkapwr_4 A KAPWR VGND VNB VPB VPWR X
 *.PININFO A:I KAPWR: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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__bufkapwr_4
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.netlist.tsv b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.netlist.tsv
index ed72f45..aed770c 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.netlist.tsv
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__bufkapwr_4	A:I KAPWR: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	KAPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	KAPWR	VPB	phighvt	4	1.26	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	KAPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	KAPWR	VPB	pfet_01v8_hvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.spice b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.spice
index 9d25690..50b4e0b 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.spice
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__bufkapwr_4 A KAPWR VGND VNB VPB VPWR X
-M1000 KAPWR a_27_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.1466e+12p pd=9.38e+06u as=7.056e+11p ps=6.16e+06u
-M1001 X a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=3.801e+11p ps=4.33e+06u
-M1002 X a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 KAPWR a_27_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 VGND a_27_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_27_47# KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_27_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_27_47# KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 KAPWR A a_27_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 KAPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 KAPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 X a_27_47# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_27_47# A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 X a_27_47# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.cdl b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.cdl
index a922e2e..a0c5d88 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.cdl
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__bufkapwr_8 A KAPWR VGND VNB VPB VPWR X
 *.PININFO A:I KAPWR: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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__bufkapwr_8
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.netlist.tsv b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.netlist.tsv
index fd894f4..b6ad8a4 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.netlist.tsv
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__bufkapwr_8	A:I KAPWR: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	KAPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	KAPWR	VPB	phighvt	8	1.26	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	KAPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	KAPWR	VPB	pfet_01v8_hvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.spice b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.spice
index 6581171..98e0336 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.spice
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__bufkapwr_8 A KAPWR VGND VNB VPB VPWR X
-M1000 X a_110_47# KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=2.079e+12p ps=1.842e+07u
-M1001 KAPWR a_110_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 X a_110_47# KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND a_110_47# X VNB nshort w=420000u l=150000u
-+  ad=6.951e+11p pd=8.35e+06u as=4.704e+11p ps=5.6e+06u
-M1004 X a_110_47# KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_110_47# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1006 KAPWR A a_110_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1007 X a_110_47# KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_110_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_110_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_110_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A a_110_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 KAPWR a_110_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 KAPWR a_110_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_110_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_110_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 KAPWR a_110_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_110_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_110_47# A KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_110_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_110_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_110_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND a_110_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_110_47# A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND A a_110_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_110_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_110_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 X a_110_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 KAPWR A a_110_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 KAPWR a_110_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 KAPWR a_110_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 X a_110_47# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 KAPWR a_110_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 KAPWR a_110_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 X a_110_47# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_110_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VGND a_110_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 X a_110_47# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VGND a_110_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 X a_110_47# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_0.cdl b/cells/buflp/sky130_fd_sc_lp__buflp_0.cdl
index 957f57b..4839516 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_0.cdl
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_0.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__buflp_0 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net24 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net24 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
-MI7 net31 Ab VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net31 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
-MMIP1 Ab 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
-MI4 net47 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
-MMIP2 X Ab 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
-MI5 net35 Ab 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
+MMIP1 Ab 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
+MI4 net47 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
+MMIP2 X Ab 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
+MI5 net35 Ab 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_lp__buflp_0
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_0.netlist.tsv b/cells/buflp/sky130_fd_sc_lp__buflp_0.netlist.tsv
index 4fcaec0..917d6d0 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_0.netlist.tsv
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_0.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__buflp_0	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	net24	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	net31	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net24	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net31	Ab	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	net47	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	net47	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	net35	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net35	Ab	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	net24	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	net31	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net24	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net31	Ab	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	net47	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	net47	A	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	net35	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net35	Ab	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/buflp/sky130_fd_sc_lp__buflp_0.spice b/cells/buflp/sky130_fd_sc_lp__buflp_0.spice
index 4a4a564..2b56461 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_0.spice
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_0.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__buflp_0 A VGND VNB VPB VPWR X
-M1000 VPWR A a_128_490# VPB phighvt w=420000u l=150000u
-+  ad=2.286e+11p pd=2.07e+06u as=1.008e+11p ps=1.32e+06u
-M1001 X a_36_120# a_315_446# VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=1.536e+11p ps=1.76e+06u
-M1002 a_287_120# a_36_120# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.176e+11p ps=1.4e+06u
-M1003 VGND A a_123_120# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1004 a_315_446# a_36_120# VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_36_120# a_287_120# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1006 a_128_490# A a_36_120# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1007 a_123_120# A a_36_120# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
+X0 VPWR a_36_120# a_315_446# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_36_120# A a_128_490# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_128_490# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_36_120# A a_123_120# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_315_446# a_36_120# X VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 VGND a_36_120# a_287_120# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_123_120# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_287_120# a_36_120# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_1.cdl b/cells/buflp/sky130_fd_sc_lp__buflp_1.cdl
index a970dda..0de5556 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_1.cdl
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__buflp_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MI6 net24 Ab VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net24 Ab VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Ab A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net31 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net31 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A 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
-MI4 net47 A 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
-MMIP2 X Ab VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net43 Ab VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 net47 A 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
+MMIP2 X Ab VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net43 Ab VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__buflp_1
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_1.netlist.tsv b/cells/buflp/sky130_fd_sc_lp__buflp_1.netlist.tsv
index 863a179..f12bbb6 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_1.netlist.tsv
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__buflp_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
-MI6	MOSFET	net24	Ab	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Ab	A	net31	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	net24	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net31	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	net47	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	net47	A	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	net43	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net43	Ab	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net24	Ab	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	net31	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	net24	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net31	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	A	net47	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	net47	A	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	net43	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net43	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_1.spice b/cells/buflp/sky130_fd_sc_lp__buflp_1.spice
index 27a03d6..6b88dce 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_1.spice
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__buflp_1 A VGND VNB VPB VPWR X
-M1000 VGND a_86_21# a_116_47# VNB nshort w=840000u l=150000u
-+  ad=2.961e+11p pd=2.52e+06u as=2.016e+11p ps=2.16e+06u
-M1001 a_86_21# A a_308_403# VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=1.536e+11p ps=1.76e+06u
-M1002 a_116_367# a_86_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.024e+11p pd=3e+06u as=3.591e+11p ps=3.09e+06u
-M1003 a_116_47# a_86_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.25e+06u
-M1004 a_86_21# A a_308_131# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.008e+11p ps=1.32e+06u
-M1005 VPWR a_86_21# a_116_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.455e+11p pd=3.36e+06u as=0p ps=0u
-M1006 a_308_131# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_308_403# A VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_116_367# a_86_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_308_131# A a_86_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR A a_308_403# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_116_47# a_86_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 X a_86_21# a_116_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 X a_86_21# a_116_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_308_403# A a_86_21# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 VGND A a_308_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_2.cdl b/cells/buflp/sky130_fd_sc_lp__buflp_2.cdl
index e192de7..e5801ab 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_2.cdl
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__buflp_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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab VNB nfet_01v8 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
-MI7 net27 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net27 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 net31 Ab VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net31 Ab VNB nfet_01v8 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 Ab A 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
-MMIP2 X Ab VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 net43 A 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
-MI5 net36 Ab VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=0.64 l=0.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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 net43 A 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
+MI5 net36 Ab VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__buflp_2
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_2.netlist.tsv b/cells/buflp/sky130_fd_sc_lp__buflp_2.netlist.tsv
index 05334d3..4f27415 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_2.netlist.tsv
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__buflp_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	net27	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	net31	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net27	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net31	Ab	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	net43	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	net36	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	net43	A	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net36	Ab	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	net27	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	net31	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net27	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net31	Ab	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	net43	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	net36	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	net43	A	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net36	Ab	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_2.spice b/cells/buflp/sky130_fd_sc_lp__buflp_2.spice
index 85e97ed..f12f121 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_2.spice
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__buflp_2 A VGND VNB VPB VPWR X
-M1000 a_128_367# a_98_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=3.528e+11p ps=3.08e+06u
-M1001 a_128_367# a_98_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=9.65e+11p ps=6.68e+06u
-M1002 a_509_377# A VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1003 VGND a_98_21# a_128_47# VNB nshort w=840000u l=150000u
-+  ad=5.544e+11p pd=4.79e+06u as=5.292e+11p ps=4.62e+06u
-M1004 X a_98_21# a_128_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_128_47# a_98_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.94e+11p ps=2.38e+06u
-M1006 X a_98_21# a_128_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_128_47# a_98_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_516_47# A VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1009 VPWR a_98_21# a_128_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_98_21# A a_516_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1011 a_98_21# A a_509_377# VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
+X0 a_128_47# a_98_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_509_377# A a_98_21# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_516_47# A a_98_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_128_47# a_98_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND A a_516_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR A a_509_377# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 VPWR a_98_21# a_128_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_128_367# a_98_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND a_98_21# a_128_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 X a_98_21# a_128_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_128_367# a_98_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 X a_98_21# a_128_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_4.cdl b/cells/buflp/sky130_fd_sc_lp__buflp_4.cdl
index 42cb221..53de14a 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_4.cdl
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__buflp_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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab VNB nfet_01v8 m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net31 Ab VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net31 Ab VNB nfet_01v8 m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net27 A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net27 A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A VPB phighvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 net43 A VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net36 Ab VPB phighvt m=4 w=1.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 net43 A VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net36 Ab VPB pfet_01v8_hvt m=4 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__buflp_4
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_4.netlist.tsv b/cells/buflp/sky130_fd_sc_lp__buflp_4.netlist.tsv
index 7e4a8c0..8045601 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_4.netlist.tsv
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__buflp_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	net27	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	net31	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net31	Ab	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net27	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	net43	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	net36	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	net43	A	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net36	Ab	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	net27	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	net31	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net31	Ab	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net27	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	net43	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	net36	VPB	pfet_01v8_hvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	net43	A	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net36	Ab	VPWR	VPB	pfet_01v8_hvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_4.spice b/cells/buflp/sky130_fd_sc_lp__buflp_4.spice
index 38b85f7..61afa24 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_4.spice
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_4.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__buflp_4 A VGND VNB VPB VPWR X
-M1000 VPWR a_84_21# a_114_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.2411e+12p pd=9.53e+06u as=1.5876e+12p ps=1.26e+07u
-M1001 X a_84_21# a_114_47# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=9.408e+11p ps=8.96e+06u
-M1002 X a_84_21# a_114_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND a_84_21# a_114_47# VNB nshort w=840000u l=150000u
-+  ad=1.0626e+12p pd=7.57e+06u as=0p ps=0u
-M1004 a_114_47# a_84_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_886_47# A VGND VNB nshort w=840000u l=150000u
-+  ad=2.016e+11p pd=2.16e+06u as=0p ps=0u
-M1006 a_84_21# A a_886_47# VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1007 X a_84_21# a_114_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=8.82e+11p pd=6.44e+06u as=0p ps=0u
-M1008 a_84_21# A a_886_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=3.024e+11p ps=3e+06u
-M1009 a_114_47# a_84_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_114_367# a_84_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_114_367# a_84_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_114_367# a_84_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_84_21# a_114_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_84_21# a_114_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_114_47# a_84_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_114_47# a_84_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_114_367# a_84_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_886_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_84_21# a_114_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_84_21# a_114_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VPWR A a_886_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_114_47# a_84_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VGND a_84_21# a_114_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 X a_84_21# a_114_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 X a_84_21# a_114_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_886_47# A a_84_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_114_367# a_84_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_114_47# a_84_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VPWR a_84_21# a_114_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 X a_84_21# a_114_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_886_367# A a_84_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_114_367# a_84_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 VPWR a_84_21# a_114_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VGND a_84_21# a_114_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_114_47# a_84_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 VGND A a_886_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_114_47# a_84_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_114_367# a_84_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_114_367# a_84_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_8.cdl b/cells/buflp/sky130_fd_sc_lp__buflp_8.cdl
index db2a941..73d15ac 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_8.cdl
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_8.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__buflp_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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=3 w=0.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab VNB nfet_01v8 m=8 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net27 A VNB nshort m=3 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net27 A VNB nfet_01v8 m=3 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net31 Ab VNB nshort m=8 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net31 Ab VNB nfet_01v8 m=8 w=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 Ab A VPB phighvt m=3 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 net43 A VPB phighvt m=3 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net47 Ab VPB phighvt m=8 w=1.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 net43 A VPB pfet_01v8_hvt m=3 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net47 Ab VPB pfet_01v8_hvt m=8 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__buflp_8
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_8.netlist.tsv b/cells/buflp/sky130_fd_sc_lp__buflp_8.netlist.tsv
index 7ccf318..d1d2072 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_8.netlist.tsv
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_8.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__buflp_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	net27	VNB	nshort	3	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	net31	VNB	nshort	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net27	A	VGND	VNB	nshort	3	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net31	Ab	VGND	VNB	nshort	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	net43	VPB	phighvt	3	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	net47	VPB	phighvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	net43	A	VPWR	VPB	phighvt	3	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net47	Ab	VPWR	VPB	phighvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	net27	VNB	nfet_01v8	3	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	net31	VNB	nfet_01v8	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net27	A	VGND	VNB	nfet_01v8	3	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net31	Ab	VGND	VNB	nfet_01v8	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	A	net43	VPB	pfet_01v8_hvt	3	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	net47	VPB	pfet_01v8_hvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	net43	A	VPWR	VPB	pfet_01v8_hvt	3	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net47	Ab	VPWR	VPB	pfet_01v8_hvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_8.spice b/cells/buflp/sky130_fd_sc_lp__buflp_8.spice
index 327dfaf..2f24720 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_8.spice
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_8.spice
@@ -16,92 +16,48 @@
 
 
 .subckt sky130_fd_sc_lp__buflp_8 A VGND VNB VPB VPWR X
-M1000 a_114_47# A VGND VNB nshort w=840000u l=150000u
-+  ad=7.056e+11p pd=6.72e+06u as=1.533e+12p ps=1.373e+07u
-M1001 VGND a_27_47# a_644_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.0412e+12p ps=1.83e+07u
-M1002 VPWR a_27_47# a_636_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.1609e+12p pd=1.855e+07u as=3.087e+12p ps=2.506e+07u
-M1003 a_114_47# A a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=5.334e+11p ps=4.63e+06u
-M1004 a_636_367# a_27_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.764e+12p ps=1.288e+07u
-M1005 VPWR a_27_47# a_636_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_47# A a_114_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_27_47# a_636_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_114_47# A a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A a_114_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.0584e+12p ps=9.24e+06u
-M1010 a_644_47# a_27_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=1.0584e+12p ps=9.24e+06u
-M1011 X a_27_47# a_636_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_27_47# a_644_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_644_47# a_27_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_636_367# a_27_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_27_47# a_636_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_636_367# a_27_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_644_47# a_27_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A a_114_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_644_47# a_27_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_114_367# A a_27_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.119e+11p ps=6.17e+06u
-M1021 a_636_367# a_27_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_644_47# a_27_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_636_367# a_27_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND A a_114_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X a_27_47# a_644_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_114_367# A a_27_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A a_114_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 X a_27_47# a_644_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND a_27_47# a_644_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_636_367# a_27_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 X a_27_47# a_644_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 X a_27_47# a_636_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_644_47# a_27_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR a_27_47# a_636_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_636_367# a_27_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 X a_27_47# a_644_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 X a_27_47# a_636_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_636_367# a_27_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_644_47# a_27_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VGND a_27_47# a_644_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_27_47# A a_114_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_114_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_644_47# a_27_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_27_47# a_644_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 X a_27_47# a_644_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_644_47# a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 X a_27_47# a_636_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_27_47# A a_114_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_27_47# A a_114_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 X a_27_47# a_636_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_114_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_636_367# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 X a_27_47# a_644_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_636_367# a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_644_47# a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_636_367# a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_114_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 X a_27_47# a_644_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_114_47# A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 VGND A a_114_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 VPWR a_27_47# a_636_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 a_636_367# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 X a_27_47# a_636_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 VGND a_27_47# a_644_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 a_644_47# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 a_644_47# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_27_47# A a_114_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 X a_27_47# a_636_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 a_636_367# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 a_644_47# a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 a_114_367# A a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 a_27_47# A a_114_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 a_114_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X30 X a_27_47# a_644_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X31 VPWR a_27_47# a_636_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X32 a_636_367# a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X33 VGND a_27_47# a_644_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X34 a_644_47# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X35 a_636_367# a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X36 a_636_367# a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X37 a_644_47# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X38 VPWR A a_114_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X39 VPWR a_27_47# a_636_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X40 VGND a_27_47# a_644_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X41 a_114_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X42 a_644_47# a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X43 VPWR a_27_47# a_636_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_m.cdl b/cells/buflp/sky130_fd_sc_lp__buflp_m.cdl
index bc96a66..c392432 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_m.cdl
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_m.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__buflp_m 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net20 Ab VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net20 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
-MI6 net24 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net24 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab 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
-MMIP2 X Ab VPB phighvt m=1 w=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 net47 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
-MI4 net43 Ab VPB phighvt m=1 w=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 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
+MMIP2 X Ab VPB pfet_01v8_hvt m=1 w=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 net47 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
+MI4 net43 Ab VPB pfet_01v8_hvt m=1 w=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_lp__buflp_m
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_m.netlist.tsv b/cells/buflp/sky130_fd_sc_lp__buflp_m.netlist.tsv
index ea3b8ab..47f741d 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_m.netlist.tsv
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_m.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__buflp_m	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	net24	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	net20	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net20	Ab	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net24	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	net47	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	net43	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net47	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	net43	Ab	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	net24	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	Ab	net20	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net20	Ab	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net24	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	A	net47	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	net43	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net47	A	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	net43	Ab	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/buflp/sky130_fd_sc_lp__buflp_m.spice b/cells/buflp/sky130_fd_sc_lp__buflp_m.spice
index 581cd18..0b7a71d 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_m.spice
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_m.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__buflp_m A VGND VNB VPB VPWR X
-M1000 a_278_120# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.176e+11p ps=1.4e+06u
-M1001 VGND a_90_94# a_120_120# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1002 a_304_490# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.596e+11p ps=1.6e+06u
-M1003 a_120_490# a_90_94# X VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1004 a_120_120# a_90_94# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1005 a_90_94# A a_278_120# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1006 a_90_94# A a_304_490# VPB phighvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1007 VPWR a_90_94# a_120_490# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_120_120# a_90_94# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_90_94# a_120_120# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_304_490# A a_90_94# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VPWR A a_304_490# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 X a_90_94# a_120_490# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VGND A a_278_120# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_120_490# a_90_94# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_278_120# A a_90_94# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/busdriver/sky130_fd_sc_lp__busdriver_20.cdl b/cells/busdriver/sky130_fd_sc_lp__busdriver_20.cdl
index a885527..a5457d5 100644
--- a/cells/busdriver/sky130_fd_sc_lp__busdriver_20.cdl
+++ b/cells/busdriver/sky130_fd_sc_lp__busdriver_20.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__busdriver_20 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 net50 VNB nshort m=14 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z net50 VNB nfet_01v8 m=14 w=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 net47 VNB nshort m=14 w=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 net47 TE_B VNB nshort 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
-MI6 net50 A VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net62 net47 VNB nshort 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
-MMP0 VPWR net62 VPB phighvt m=20 w=1.26 l=0.15 mult=1 sa=0.265
+MMN1 sndA net47 VNB nfet_01v8 m=14 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB net50 VPB phighvt m=20 w=1.26 l=0.15 mult=1 sa=0.265
+MMIN1 net47 TE_B VNB nfet_01v8 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 net47 TE_B VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
+MI6 net50 A VNB nfet_01v8 m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net62 net47 VNB nfet_01v8 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
-MI7 net62 net47 VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net50 A VPB phighvt m=8 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR net62 VPB pfet_01v8_hvt m=20 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB net50 VPB pfet_01v8_hvt m=20 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net47 TE_B VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net62 net47 VPB pfet_01v8_hvt m=4 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net50 A VPB pfet_01v8_hvt m=8 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__busdriver_20
diff --git a/cells/busdriver/sky130_fd_sc_lp__busdriver_20.netlist.tsv b/cells/busdriver/sky130_fd_sc_lp__busdriver_20.netlist.tsv
index 9abbd70..3cc9ee1 100644
--- a/cells/busdriver/sky130_fd_sc_lp__busdriver_20.netlist.tsv
+++ b/cells/busdriver/sky130_fd_sc_lp__busdriver_20.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__busdriver_20	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	net50	sndA	VNB	nshort	14	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net47	VGND	VNB	nshort	14	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net47	TE_B	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net50	A	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net62	net47	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	net62	sndTEB	VPB	phighvt	20	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	net50	Z	VPB	phighvt	20	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net47	TE_B	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net62	net47	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net50	A	VPWR	VPB	phighvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	net50	sndA	VNB	nfet_01v8	14	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net47	VGND	VNB	nfet_01v8	14	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net47	TE_B	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net50	A	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net62	net47	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	net62	sndTEB	VPB	pfet_01v8_hvt	20	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	net50	Z	VPB	pfet_01v8_hvt	20	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net47	TE_B	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net62	net47	VPWR	VPB	pfet_01v8_hvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net50	A	VPWR	VPB	pfet_01v8_hvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/busdriver/sky130_fd_sc_lp__busdriver_20.spice b/cells/busdriver/sky130_fd_sc_lp__busdriver_20.spice
index 0419e10..605f6b8 100644
--- a/cells/busdriver/sky130_fd_sc_lp__busdriver_20.spice
+++ b/cells/busdriver/sky130_fd_sc_lp__busdriver_20.spice
@@ -16,184 +16,94 @@
 
 
 .subckt sky130_fd_sc_lp__busdriver_20 A TE_B VGND VNB VPB VPWR Z
-M1000 a_630_367# a_286_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+12p pd=6.16e+07u as=6.7851e+12p ps=5.865e+07u
-M1001 VPWR a_286_367# a_630_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Z a_1909_21# a_630_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.8934e+12p pd=3.39e+07u as=0p ps=0u
-M1003 Z a_1909_21# a_630_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR a_286_367# a_630_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A a_1909_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.4112e+12p ps=1.232e+07u
-M1006 VGND a_114_47# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=3.3588e+12p pd=2.828e+07u as=2.7968e+12p ps=2.794e+07u
-M1007 VPWR a_286_367# a_630_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Z a_1909_21# a_630_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_114_47# a_286_367# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.661e+11p ps=2.96e+06u
-M1010 a_584_47# a_114_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_630_367# a_286_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Z a_1909_21# a_630_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_630_367# a_1909_21# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_114_47# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_114_47# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_584_47# a_1909_21# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.3568e+12p ps=1.32e+07u
-M1017 a_1909_21# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND TE_B a_114_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1019 a_584_47# a_1909_21# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_286_367# a_630_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_114_47# TE_B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Z a_1909_21# a_630_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR a_114_47# a_286_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1024 Z a_1909_21# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1909_21# A VGND VNB nshort w=840000u l=150000u
-+  ad=5.334e+11p pd=4.63e+06u as=0p ps=0u
-M1026 VGND A a_1909_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Z a_1909_21# a_630_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_630_367# a_1909_21# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_584_47# a_1909_21# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_630_367# a_286_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_630_367# a_286_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_630_367# a_286_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Z a_1909_21# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Z a_1909_21# a_630_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND a_114_47# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Z a_1909_21# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR a_286_367# a_630_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_630_367# a_286_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_630_367# a_1909_21# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_584_47# a_114_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_630_367# a_286_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 Z a_1909_21# a_630_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_1909_21# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VPWR A a_1909_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_286_367# a_114_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_584_47# a_114_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VGND a_114_47# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 a_630_367# a_286_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 a_584_47# a_114_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 a_584_47# a_1909_21# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 a_630_367# a_286_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 VGND a_114_47# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1053 Z a_1909_21# a_630_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 a_584_47# a_1909_21# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 VPWR a_114_47# a_286_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 a_630_367# a_1909_21# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 VPWR A a_1909_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 VGND a_114_47# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 a_114_47# TE_B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1060 a_630_367# a_1909_21# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1061 Z a_1909_21# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1062 a_584_47# a_1909_21# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 a_630_367# a_1909_21# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1064 a_286_367# a_114_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1065 VPWR a_286_367# a_630_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1066 a_630_367# a_286_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1067 a_630_367# a_1909_21# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1068 VPWR a_286_367# a_630_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 VPWR a_286_367# a_630_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1070 a_1909_21# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1071 a_584_47# a_114_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1072 Z a_1909_21# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1073 a_630_367# a_1909_21# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1074 a_584_47# a_114_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1075 a_630_367# a_1909_21# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1076 Z a_1909_21# a_630_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1077 Z a_1909_21# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1078 VPWR A a_1909_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1079 VPWR a_286_367# a_630_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1080 a_630_367# a_1909_21# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1081 a_1909_21# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1082 a_584_47# a_114_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1083 Z a_1909_21# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1084 VGND A a_1909_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1085 a_1909_21# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1086 VPWR a_286_367# a_630_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1087 a_584_47# a_1909_21# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1088 VPWR TE_B a_114_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1089 a_286_367# a_114_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_286_367# a_630_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_630_367# a_286_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_1909_21# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 Z a_1909_21# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_584_47# a_114_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 VPWR a_286_367# a_630_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_630_367# a_286_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VGND TE_B a_114_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_584_47# a_114_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 VGND a_114_47# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 Z a_1909_21# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_584_47# a_1909_21# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 VGND A a_1909_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_630_367# a_286_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_630_367# a_1909_21# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VGND a_114_47# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 VGND a_114_47# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 a_584_47# a_114_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 a_286_367# a_114_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VPWR a_286_367# a_630_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 Z a_1909_21# a_630_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 a_630_367# a_1909_21# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 Z a_1909_21# a_630_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 VGND a_114_47# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X24 a_584_47# a_1909_21# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X25 Z a_1909_21# a_630_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 a_1909_21# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 VPWR a_286_367# a_630_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 VPWR a_286_367# a_630_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 a_630_367# a_1909_21# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 VPWR A a_1909_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 Z a_1909_21# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X32 a_630_367# a_286_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X33 a_584_47# a_1909_21# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X34 a_630_367# a_286_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X35 a_630_367# a_286_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X36 VGND a_114_47# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X37 VPWR a_286_367# a_630_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X38 VPWR a_286_367# a_630_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X39 Z a_1909_21# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X40 a_630_367# a_286_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X41 a_630_367# a_1909_21# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X42 a_286_367# a_114_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X43 a_584_47# a_1909_21# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X44 VGND A a_1909_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X45 VPWR a_286_367# a_630_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X46 a_630_367# a_1909_21# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X47 Z a_1909_21# a_630_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X48 Z a_1909_21# a_630_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X49 a_114_47# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X50 a_584_47# a_114_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X51 Z a_1909_21# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X52 a_1909_21# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X53 VPWR a_286_367# a_630_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X54 Z a_1909_21# a_630_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X55 VGND a_114_47# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X56 a_584_47# a_114_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X57 a_1909_21# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X58 VGND a_114_47# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X59 a_584_47# a_1909_21# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X60 a_1909_21# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X61 VPWR A a_1909_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X62 VGND a_114_47# a_286_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X63 VPWR TE_B a_114_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X64 a_630_367# a_286_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X65 a_630_367# a_286_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X66 VPWR a_286_367# a_630_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X67 Z a_1909_21# a_630_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X68 Z a_1909_21# a_630_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X69 a_114_47# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X70 VPWR a_114_47# a_286_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X71 Z a_1909_21# a_630_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X72 a_630_367# a_1909_21# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X73 a_630_367# a_1909_21# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X74 a_584_47# a_1909_21# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X75 a_630_367# a_1909_21# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X76 VPWR A a_1909_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X77 Z a_1909_21# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X78 a_584_47# a_1909_21# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X79 a_584_47# a_114_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X80 a_584_47# a_114_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X81 VPWR a_114_47# a_286_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X82 a_630_367# a_286_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X83 a_630_367# a_1909_21# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X84 a_286_367# a_114_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X85 Z a_1909_21# a_630_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X86 a_630_367# a_1909_21# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X87 VPWR A a_1909_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X88 a_1909_21# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X89 Z a_1909_21# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.cdl b/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.cdl
index 0acf60d..fdfb58a 100644
--- a/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.cdl
+++ b/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__busdriver2_20 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 net42 VNB nshort m=14 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z net42 VNB nfet_01v8 m=14 w=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 net39 VNB nshort m=14 w=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 net39 TE_B VNB nshort 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
-MI6 net42 A VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net66 net39 VNB nshort 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
-MMP0 VPWR net66 VPB pshort m=20 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB net42 VPB pshort m=20 w=1.26 l=0.15 mult=1 sa=0.265
+MMN1 sndA net39 VNB nfet_01v8 m=14 w=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 net39 TE_B VPB pshort m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 net39 TE_B VNB nfet_01v8 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
+MI6 net42 A VNB nfet_01v8 m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net66 net39 VPB pshort m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net42 A VPB pshort m=8 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net66 net39 VNB nfet_01v8 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
+MMP0 VPWR net66 VPB pfet_01v8 m=20 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB net42 VPB pfet_01v8 m=20 w=1.26 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 m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net66 net39 VPB pfet_01v8 m=4 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net42 A VPB pfet_01v8 m=8 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__busdriver2_20
diff --git a/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.netlist.tsv b/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.netlist.tsv
index 1ed9031..4c23529 100644
--- a/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.netlist.tsv
+++ b/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__busdriver2_20	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	net42	sndA	VNB	nshort	14	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net39	VGND	VNB	nshort	14	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net39	TE_B	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net42	A	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net66	net39	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	net66	sndTEB	VPB	pshort	20	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	net42	Z	VPB	pshort	20	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net39	TE_B	VPWR	VPB	pshort	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net66	net39	VPWR	VPB	pshort	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net42	A	VPWR	VPB	pshort	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	net42	sndA	VNB	nfet_01v8	14	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net39	VGND	VNB	nfet_01v8	14	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net39	TE_B	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net42	A	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net66	net39	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	net66	sndTEB	VPB	pfet_01v8	20	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	net42	Z	VPB	pfet_01v8	20	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net39	TE_B	VPWR	VPB	pfet_01v8	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net66	net39	VPWR	VPB	pfet_01v8	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net42	A	VPWR	VPB	pfet_01v8	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.spice b/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.spice
index eb150b4..a5c59d1 100644
--- a/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.spice
+++ b/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.spice
@@ -16,184 +16,94 @@
 
 
 .subckt sky130_fd_sc_lp__busdriver2_20 A TE_B VGND VNB VPB VPWR Z
-M1000 Z a_1909_21# a_630_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=3.8934e+12p pd=3.39e+07u as=7.056e+12p ps=6.16e+07u
-M1001 VPWR a_286_367# a_630_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=6.7851e+12p pd=5.865e+07u as=0p ps=0u
-M1002 a_630_367# a_1909_21# Z VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND a_114_47# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=3.3588e+12p pd=2.828e+07u as=2.7968e+12p ps=2.794e+07u
-M1004 VPWR TE_B a_114_47# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1005 a_630_367# a_286_367# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_630_367# a_1909_21# Z VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_114_47# TE_B VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Z a_1909_21# a_630_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A a_1909_21# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.4112e+12p ps=1.232e+07u
-M1010 VGND a_114_47# a_286_367# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.661e+11p ps=2.96e+06u
-M1011 a_584_47# a_114_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_630_367# a_286_367# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_630_367# a_1909_21# Z VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1909_21# A VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_114_47# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_114_47# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_584_47# a_1909_21# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.3568e+12p ps=1.32e+07u
-M1018 VPWR a_286_367# a_630_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_286_367# a_630_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND TE_B a_114_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1021 a_584_47# a_1909_21# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_630_367# a_286_367# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_630_367# a_1909_21# Z VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_114_47# TE_B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Z a_1909_21# a_630_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Z a_1909_21# a_630_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Z a_1909_21# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1909_21# A VGND VNB nshort w=840000u l=150000u
-+  ad=5.334e+11p pd=4.63e+06u as=0p ps=0u
-M1029 VGND A a_1909_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_630_367# a_1909_21# Z VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_584_47# a_1909_21# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_630_367# a_1909_21# Z VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Z a_1909_21# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1909_21# A VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND a_114_47# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Z a_1909_21# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR a_286_367# a_630_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Z a_1909_21# a_630_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_584_47# a_114_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_630_367# a_286_367# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VPWR a_286_367# a_630_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_630_367# a_1909_21# Z VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_286_367# a_114_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_584_47# a_114_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VGND a_114_47# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_630_367# a_1909_21# Z VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 a_584_47# a_114_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 a_584_47# a_1909_21# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 a_286_367# a_114_47# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1050 Z a_1909_21# a_630_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 VGND a_114_47# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 VPWR A a_1909_21# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1053 a_584_47# a_1909_21# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 VPWR a_114_47# a_286_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 a_630_367# a_286_367# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 Z a_1909_21# a_630_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 VGND a_114_47# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 a_630_367# a_286_367# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 Z a_1909_21# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1060 a_584_47# a_1909_21# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1061 VPWR a_286_367# a_630_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1062 a_630_367# a_1909_21# Z VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 Z a_1909_21# a_630_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1064 VPWR a_286_367# a_630_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1065 VPWR a_286_367# a_630_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1066 a_584_47# a_114_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1067 Z a_1909_21# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1068 a_286_367# a_114_47# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1069 a_630_367# a_286_367# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1070 a_584_47# a_114_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1071 VPWR a_114_47# a_286_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1072 VPWR A a_1909_21# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1073 Z a_1909_21# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1074 a_630_367# a_286_367# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1075 Z a_1909_21# a_630_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1076 a_1909_21# A VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1077 VPWR a_286_367# a_630_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1078 a_630_367# a_1909_21# Z VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1079 a_1909_21# A VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1080 a_584_47# a_114_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1081 Z a_1909_21# a_584_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1082 VGND A a_1909_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1083 a_1909_21# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1084 VPWR a_286_367# a_630_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1085 VPWR A a_1909_21# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1086 a_584_47# a_1909_21# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1087 a_630_367# a_286_367# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1088 Z a_1909_21# a_630_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1089 a_630_367# a_286_367# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_630_367# a_286_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X1 Z a_1909_21# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 VPWR a_114_47# a_286_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X3 VPWR a_114_47# a_286_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X4 a_630_367# a_286_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X5 a_584_47# a_114_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_630_367# a_286_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X7 a_630_367# a_1909_21# Z VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X8 VGND TE_B a_114_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_584_47# a_114_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 VGND a_114_47# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 Z a_1909_21# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_584_47# a_1909_21# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 VPWR a_286_367# a_630_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X14 VGND A a_1909_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 Z a_1909_21# a_630_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X16 VGND a_114_47# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 VGND a_114_47# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 a_584_47# a_114_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 VPWR a_286_367# a_630_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X20 VPWR a_286_367# a_630_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X21 VGND a_114_47# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 a_584_47# a_1909_21# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X23 VPWR a_286_367# a_630_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X24 VPWR a_286_367# a_630_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X25 Z a_1909_21# a_630_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X26 Z a_1909_21# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X27 a_114_47# TE_B VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X28 VPWR a_286_367# a_630_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X29 a_584_47# a_1909_21# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X30 a_286_367# a_114_47# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X31 VPWR a_286_367# a_630_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X32 Z a_1909_21# a_630_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X33 a_1909_21# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X34 VGND a_114_47# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X35 a_286_367# a_114_47# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X36 a_1909_21# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X37 Z a_1909_21# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X38 a_630_367# a_1909_21# Z VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X39 a_286_367# a_114_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X40 a_584_47# a_1909_21# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X41 VGND A a_1909_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X42 a_630_367# a_1909_21# Z VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X43 a_114_47# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X44 a_584_47# a_114_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X45 Z a_1909_21# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X46 a_1909_21# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X47 a_630_367# a_1909_21# Z VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X48 VGND a_114_47# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X49 a_584_47# a_114_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X50 a_630_367# a_286_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X51 a_630_367# a_1909_21# Z VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X52 a_630_367# a_1909_21# Z VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X53 VGND a_114_47# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X54 a_584_47# a_1909_21# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X55 a_1909_21# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X56 a_630_367# a_1909_21# Z VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X57 a_1909_21# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X58 VGND a_114_47# a_286_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X59 VPWR A a_1909_21# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X60 a_630_367# a_286_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X61 Z a_1909_21# a_630_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X62 VPWR A a_1909_21# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X63 VPWR a_286_367# a_630_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X64 a_630_367# a_286_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X65 VPWR A a_1909_21# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X66 Z a_1909_21# a_630_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X67 a_584_47# a_1909_21# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X68 Z a_1909_21# a_630_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X69 Z a_1909_21# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X70 Z a_1909_21# a_630_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X71 Z a_1909_21# a_630_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X72 a_584_47# a_1909_21# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X73 VPWR a_286_367# a_630_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X74 Z a_1909_21# a_630_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X75 Z a_1909_21# a_630_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X76 VPWR A a_1909_21# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X77 a_584_47# a_114_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X78 a_630_367# a_286_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X79 a_630_367# a_286_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X80 a_630_367# a_1909_21# Z VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X81 a_630_367# a_286_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X82 a_630_367# a_1909_21# Z VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X83 a_584_47# a_114_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X84 VPWR TE_B a_114_47# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X85 a_630_367# a_286_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X86 VPWR a_286_367# a_630_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X87 a_1909_21# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X88 a_630_367# a_1909_21# Z VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X89 Z a_1909_21# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.cdl b/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.cdl
index bb498cc..92e5249 100644
--- a/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.cdl
+++ b/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_lp__busdrivernovlp_20 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MI28 TE TE_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI28 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
-MMN1 Z net89 VNB nshort m=14 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Z net89 VNB nfet_01v8 m=14 w=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 net89 TE_B VNB nshort 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
-MI25 net89 A VNB nshort 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
-MI24 net61 A VNB nshort 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
-MI23 net57 net58 VNB nshort 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
-MI22 net58 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
-MI21 net58 net89 VNB nshort m=1 w=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 net90 net57 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 net44 TE VNB nshort m=1 w=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 Z net57 VPB phighvt m=20 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 TE TE_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
-MI11 net90 net57 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI26 net89 TE_B VNB nfet_01v8 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
-MI20 net58 net89 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI25 net89 A VNB nfet_01v8 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
+MI24 net61 A VNB nfet_01v8 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
+MI23 net57 net58 VNB nfet_01v8 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
-MI19 net100 TE_B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI22 net58 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
-MI10 net57 A VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net89 net90 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
+MI21 net58 net89 VNB nfet_01v8 m=1 w=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 net88 A VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MI13 net90 net57 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 net44 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
-MI12 net90 TE 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
-MI9 net57 TE VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 Z net57 VPB pfet_01v8_hvt m=20 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 TE 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
+MI11 net90 net57 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net58 net89 VPB pfet_01v8_hvt m=1 w=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 net100 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
+MI10 net57 A VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net89 net90 VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 net88 A VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI12 net90 TE VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net57 TE VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__busdrivernovlp_20
diff --git a/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.netlist.tsv b/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.netlist.tsv
index f56434d..bc07e95 100644
--- a/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.netlist.tsv
+++ b/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_lp__busdrivernovlp_20	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
-MI28	MOSFET	TE	TE_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Z	net89	VGND	VNB	nshort	14	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net89	TE_B	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net89	A	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	net61	A	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net57	net58	net61	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net58	TE_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net58	net89	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	net90	net57	net44	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	net44	TE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	Z	net57	VPWR	VPB	phighvt	20	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	TE	TE_B	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net90	net57	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net58	net89	net100	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	net100	TE_B	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net57	A	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net89	net90	net88	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	net88	A	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net90	TE	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net57	TE	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	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
+MMN1	MOSFET	Z	net89	VGND	VNB	nfet_01v8	14	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net89	TE_B	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net89	A	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	net61	A	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net57	net58	net61	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net58	TE_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net58	net89	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	net90	net57	net44	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	net44	TE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Z	net57	VPWR	VPB	pfet_01v8_hvt	20	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	TE	TE_B	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net90	net57	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net58	net89	net100	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	net100	TE_B	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net57	A	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net89	net90	net88	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	net88	A	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net90	TE	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net57	TE	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.spice b/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.spice
index e4208b9..ac0e8da 100644
--- a/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.spice
+++ b/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.spice
@@ -16,124 +16,64 @@
 
 
 .subckt sky130_fd_sc_lp__busdrivernovlp_20 A TE_B VGND VNB VPB VPWR Z
-M1000 a_658_367# a_381_85# a_726_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4049e+12p pd=9.79e+06u as=3.528e+11p ps=3.08e+06u
-M1001 a_726_47# A VGND VNB nshort w=840000u l=150000u
-+  ad=6.774e+11p pd=5.18e+06u as=3.1757e+12p ps=2.682e+07u
-M1002 VGND A a_1451_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=8.022e+11p ps=6.95e+06u
-M1003 a_1451_47# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A a_658_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.6423e+12p pd=5.222e+07u as=0p ps=0u
-M1005 VPWR A a_217_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1006 Z a_217_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+12p pd=3.08e+07u as=0p ps=0u
-M1007 VGND a_726_47# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.44e+12p ps=1.474e+07u
-M1008 VGND a_726_47# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_217_367# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Z a_217_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_658_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_1260_373# TE_B VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.016e+11p pd=2.16e+06u as=0p ps=0u
-M1013 VPWR a_217_367# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A a_726_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_726_47# a_1238_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.47e+11p ps=1.54e+06u
-M1016 VPWR a_217_367# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Z a_217_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_726_47# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Z a_217_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1238_47# TE_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_217_367# a_27_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_726_47# a_381_85# a_658_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Z a_217_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_217_367# a_1238_47# a_1451_47# VNB nshort w=840000u l=150000u
-+  ad=3.024e+11p pd=2.4e+06u as=0p ps=0u
-M1025 Z a_726_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_217_367# a_381_85# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1027 a_726_47# TE_B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_217_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR a_217_367# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Z a_217_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Z a_217_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR a_217_367# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND a_726_47# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Z a_217_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND a_726_47# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR a_217_367# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1451_47# a_1238_47# a_217_367# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Z a_726_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND TE_B a_27_367# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1040 VPWR a_217_367# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 Z a_726_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_1238_47# a_726_47# a_1260_373# VPB phighvt w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1043 Z a_726_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VGND a_726_47# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VGND TE_B a_726_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_381_85# a_27_367# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VPWR a_217_367# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 VPWR TE_B a_27_367# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.268e+11p ps=2.22e+06u
-M1049 Z a_726_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 VPWR a_27_367# a_217_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 Z a_217_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 VPWR a_217_367# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1053 a_381_85# a_217_367# a_303_85# VNB nshort w=420000u l=150000u
-+  ad=1.912e+11p pd=1.8e+06u as=1.008e+11p ps=1.32e+06u
-M1054 Z a_726_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 a_303_85# a_27_367# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 Z a_217_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 VPWR a_217_367# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 VGND a_726_47# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 Z a_726_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_217_367# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_1238_47# a_726_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_217_367# a_1238_47# a_1451_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VPWR a_217_367# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 Z a_217_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_726_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_217_367# a_27_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VPWR a_27_367# a_381_85# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 Z a_217_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR a_217_367# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_27_367# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 Z a_726_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 VPWR A a_217_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_726_47# a_381_85# a_658_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VGND a_27_367# a_303_85# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VGND A a_726_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 Z a_726_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 a_658_367# a_381_85# a_726_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VPWR A a_658_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VPWR TE_B a_1260_373# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X20 Z a_217_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 VPWR a_217_367# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 VGND a_726_47# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X23 a_381_85# a_217_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X24 Z a_217_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 VPWR a_217_367# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 Z a_217_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 VGND TE_B a_1238_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_1451_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 a_27_367# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X30 a_217_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 VGND a_726_47# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X32 Z a_217_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X33 Z a_726_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X34 VGND a_726_47# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X35 a_658_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X36 a_1260_373# a_726_47# a_1238_47# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X37 VPWR a_217_367# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X38 Z a_726_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X39 Z a_217_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X40 VPWR a_217_367# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X41 VGND a_726_47# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X42 VGND TE_B a_726_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X43 a_726_47# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X44 VPWR a_217_367# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X45 VGND a_726_47# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X46 VGND a_726_47# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X47 Z a_217_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X48 Z a_726_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X49 VPWR a_27_367# a_217_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X50 VPWR a_217_367# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X51 Z a_217_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X52 a_303_85# a_217_367# a_381_85# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X53 Z a_217_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X54 VPWR a_217_367# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X55 VGND A a_1451_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X56 Z a_726_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X57 VGND a_726_47# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X58 a_1451_47# a_1238_47# a_217_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X59 Z a_726_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.cdl b/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.cdl
index b0e6876..a29838c 100644
--- a/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.cdl
+++ b/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_lp__busdrivernovlp2_20 A TE_B VGND VNB VPB VPWR Z
 *.PININFO A:I TE_B:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MI28 TE TE_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI28 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
-MMN1 Z net77 VNB nshort m=14 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Z net77 VNB nfet_01v8 m=14 w=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 net77 TE_B VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI26 net77 TE_B VNB nfet_01v8 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
+MI25 net77 A VNB nfet_01v8 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
-MI25 net77 A VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI24 net57 A VNB nfet_01v8 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
-MI24 net57 A VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI23 net53 net54 VNB nfet_01v8 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
+MI22 net54 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
+MI21 net54 net77 VNB nfet_01v8 m=1 w=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 net78 net53 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 net40 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
-MI23 net53 net54 VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Z net53 VPB pfet_01v8 m=20 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 net54 TE_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI27 TE TE_B VPB pfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 net54 net77 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI11 net78 net53 VPB pfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net54 net77 VPB pfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 net101 TE_B VPB pfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net53 A VPB pfet_01v8 m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 net78 net53 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI18 net77 net78 VPB pfet_01v8 m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 net76 A VPB pfet_01v8 m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 net40 TE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI12 net78 TE VPB pfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 Z net53 VPB pshort m=20 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 TE TE_B VPB pshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 net78 net53 VPB pshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net54 net77 VPB pshort m=1 w=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 net101 TE_B VPB pshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net53 A VPB pshort m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net77 net78 VPB pshort m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 net76 A VPB pshort m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net78 TE VPB pshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net53 TE VPB pshort m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 net53 TE VPB pfet_01v8 m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__busdrivernovlp2_20
diff --git a/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.netlist.tsv b/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.netlist.tsv
index 8ca0e39..0039bb9 100644
--- a/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.netlist.tsv
+++ b/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_lp__busdrivernovlp2_20	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
-MI28	MOSFET	TE	TE_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Z	net77	VGND	VNB	nshort	14	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net77	TE_B	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net77	A	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	net57	A	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net53	net54	net57	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net54	TE_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net54	net77	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	net78	net53	net40	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	net40	TE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	Z	net53	VPWR	VPB	pshort	20	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	TE	TE_B	VPWR	VPB	pshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net78	net53	VPWR	VPB	pshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net54	net77	net101	VPB	pshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	net101	TE_B	VPWR	VPB	pshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net53	A	VPWR	VPB	pshort	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net77	net78	net76	VPB	pshort	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	net76	A	VPWR	VPB	pshort	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net78	TE	VPWR	VPB	pshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net53	TE	VPWR	VPB	pshort	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	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
+MMN1	MOSFET	Z	net77	VGND	VNB	nfet_01v8	14	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net77	TE_B	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net77	A	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	net57	A	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net53	net54	net57	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net54	TE_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net54	net77	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	net78	net53	net40	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	net40	TE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Z	net53	VPWR	VPB	pfet_01v8	20	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	TE	TE_B	VPWR	VPB	pfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net78	net53	VPWR	VPB	pfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net54	net77	net101	VPB	pfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	net101	TE_B	VPWR	VPB	pfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net53	A	VPWR	VPB	pfet_01v8	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net77	net78	net76	VPB	pfet_01v8	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	net76	A	VPWR	VPB	pfet_01v8	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net78	TE	VPWR	VPB	pfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net53	TE	VPWR	VPB	pfet_01v8	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.spice b/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.spice
index e537953..1230d82 100644
--- a/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.spice
+++ b/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.spice
@@ -16,124 +16,64 @@
 
 
 .subckt sky130_fd_sc_lp__busdrivernovlp2_20 A TE_B VGND VNB VPB VPWR Z
-M1000 a_1238_47# a_726_47# a_1260_373# VPB pshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=2.016e+11p ps=2.16e+06u
-M1001 a_726_47# A VGND VNB nshort w=840000u l=150000u
-+  ad=6.774e+11p pd=5.18e+06u as=3.1757e+12p ps=2.682e+07u
-M1002 VGND A a_1451_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=8.022e+11p ps=6.95e+06u
-M1003 a_1451_47# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR a_217_367# Z VPB pshort w=1.26e+06u l=150000u
-+  ad=6.6423e+12p pd=5.222e+07u as=3.528e+12p ps=3.08e+07u
-M1005 VGND a_726_47# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.44e+12p ps=1.474e+07u
-M1006 VGND a_726_47# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_658_367# a_381_85# a_726_47# VPB pshort w=1.26e+06u l=150000u
-+  ad=1.4049e+12p pd=9.79e+06u as=3.528e+11p ps=3.08e+06u
-M1008 VPWR a_217_367# Z VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_217_367# Z VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A a_726_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_726_47# a_1238_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.47e+11p ps=1.54e+06u
-M1012 Z a_217_367# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_726_47# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Z a_217_367# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_217_367# a_27_367# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1016 VPWR a_217_367# Z VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_217_367# Z VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1238_47# TE_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_27_367# a_217_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_217_367# a_1238_47# a_1451_47# VNB nshort w=840000u l=150000u
-+  ad=3.024e+11p pd=2.4e+06u as=0p ps=0u
-M1021 Z a_726_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Z a_217_367# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_726_47# a_381_85# a_658_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_726_47# TE_B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Z a_217_367# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_217_367# Z VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Z a_217_367# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_217_367# A VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND a_726_47# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A a_658_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR A a_217_367# VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Z a_217_367# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR a_217_367# Z VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND a_726_47# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_381_85# a_27_367# VPWR VPB pshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1036 VPWR a_217_367# Z VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR a_217_367# Z VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR a_217_367# a_381_85# VPB pshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_1451_47# a_1238_47# a_217_367# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 Z a_726_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VGND TE_B a_27_367# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1042 Z a_217_367# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 Z a_726_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_1260_373# TE_B VPWR VPB pshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_658_367# A VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 Z a_726_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VGND a_726_47# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 Z a_217_367# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VGND TE_B a_726_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 Z a_217_367# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 Z a_217_367# VPWR VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 VPWR TE_B a_27_367# VPB pshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.268e+11p ps=2.22e+06u
-M1053 VPWR a_217_367# Z VPB pshort w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 Z a_726_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 a_381_85# a_217_367# a_303_85# VNB nshort w=420000u l=150000u
-+  ad=1.912e+11p pd=1.8e+06u as=1.008e+11p ps=1.32e+06u
-M1056 Z a_726_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 a_303_85# a_27_367# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 VGND a_726_47# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 Z a_726_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_217_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X1 VPWR a_217_367# Z VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X2 a_1238_47# a_726_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_217_367# a_1238_47# a_1451_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_726_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_27_367# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_381_85# a_217_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=150000u
+X7 VPWR a_217_367# Z VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X8 Z a_726_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 a_658_367# a_381_85# a_726_47# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X10 VGND a_27_367# a_303_85# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND A a_726_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 Z a_726_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 Z a_217_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X14 VPWR TE_B a_1260_373# VPB sky130_fd_pr__pfet_01v8 w=840000u l=150000u
+X15 a_217_367# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X16 Z a_217_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X17 VGND a_726_47# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 Z a_217_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X19 Z a_217_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X20 Z a_217_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X21 VGND TE_B a_1238_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_1451_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 Z a_217_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X24 VGND a_726_47# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X25 VPWR a_217_367# Z VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X26 a_27_367# TE_B VPWR VPB sky130_fd_pr__pfet_01v8 w=840000u l=150000u
+X27 VPWR a_217_367# Z VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X28 Z a_726_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X29 VGND a_726_47# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X30 VPWR a_217_367# Z VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X31 Z a_726_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X32 VPWR A a_658_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X33 VPWR a_217_367# Z VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X34 VPWR a_217_367# Z VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X35 VGND a_726_47# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X36 VPWR a_27_367# a_217_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X37 VGND TE_B a_726_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X38 VPWR a_217_367# Z VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X39 a_726_47# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X40 VPWR a_217_367# Z VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X41 VPWR a_217_367# Z VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X42 VGND a_726_47# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X43 a_658_367# A VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X44 Z a_217_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X45 Z a_217_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X46 VGND a_726_47# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X47 Z a_217_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X48 Z a_726_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X49 VPWR a_27_367# a_381_85# VPB sky130_fd_pr__pfet_01v8 w=840000u l=150000u
+X50 a_303_85# a_217_367# a_381_85# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X51 VGND A a_1451_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X52 Z a_726_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X53 a_726_47# a_381_85# a_658_367# VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X54 VGND a_726_47# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X55 a_217_367# a_27_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X56 a_1260_373# a_726_47# a_1238_47# VPB sky130_fd_pr__pfet_01v8 w=840000u l=150000u
+X57 Z a_217_367# VPWR VPB sky130_fd_pr__pfet_01v8 w=1.26e+06u l=150000u
+X58 a_1451_47# a_1238_47# a_217_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X59 Z a_726_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.cdl b/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.cdl
index e608ed9..57164da 100644
--- a/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.cdl
+++ b/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.cdl
@@ -16,64 +16,64 @@
 
 .SUBCKT sky130_fd_sc_lp__busdrivernovlpsleep_20 A SLEEP TE_B KAPWR VGND VNB VPB VPWR Z
 *.PININFO A:I SLEEP:I TE_B:I KAPWR:I VGND:I VNB:I VPB:I VPWR:I Z:O
-MI33 TE TE_B VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI33 TE TE_B VNB nfet_01v8 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
-MI31 TE SLEEP VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI31 TE SLEEP VNB nfet_01v8 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
-MI28 SLEEPB SLEEP VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI28 SLEEPB SLEEP VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 Z net145 VNB nshort m=14 w=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 net145 TEB_INT VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265
+MMN1 Z net145 VNB nfet_01v8 m=14 w=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 net145 A VNB nshort 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
-MI24 net93 A VNB nshort 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
-MI23 net89 net90 VNB nshort 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
-MI22 net90 TEB_INT VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI26 net145 TEB_INT VNB nfet_01v8 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
-MI21 net90 net145 VNB nshort m=1 w=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 net146 net89 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 net73 TE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI25 net145 A VNB nfet_01v8 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 TEB_INT TE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI24 net93 A VNB nfet_01v8 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
-MI29 net108 SLEEP VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI23 net89 net90 VNB nfet_01v8 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
-MI36 TEB_INT TE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI22 net90 TEB_INT VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI21 net90 net145 VNB nfet_01v8 m=1 w=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 net146 net89 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 net73 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
-MI32 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
-MI30 net116 SLEEP VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI37 TEB_INT TE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 Z net89 VPB phighvt m=20 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 SLEEPB SLEEP VPB phighvt m=1 w=1.0 l=0.25 mult=1 sa=0.265
+MI29 net108 SLEEP VNB nfet_01v8 m=1 w=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 net146 net89 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI36 TEB_INT 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
-MI20 net90 net145 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI32 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
-MI39 net148 SLEEP VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
+MI30 net116 SLEEP 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
-MI19 net153 TEB_INT VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MMP0 Z net89 VPB pfet_01v8_hvt m=20 w=1.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net89 A VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net145 net146 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
+MI27 SLEEPB SLEEP 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
-MI17 net144 A VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 net146 TE 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
-MI9 net89 TE VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI38 net146 SLEEPB VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
+MI11 net146 net89 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI40 net136 SLEEP VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI20 net90 net145 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 net148 SLEEP VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 net153 TEB_INT VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net89 A VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net145 net146 VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 net144 A VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI12 net146 TE VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net89 TE VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 net146 SLEEPB VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI40 net136 SLEEP VPB pfet_01v8_hvt m=1 w=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_lp__busdrivernovlpsleep_20
diff --git a/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.netlist.tsv b/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.netlist.tsv
index 25c2580..b829f14 100644
--- a/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.netlist.tsv
+++ b/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.netlist.tsv
@@ -1,32 +1,32 @@
 sky130_fd_sc_lp__busdrivernovlpsleep_20	A:I SLEEP:I TE_B:I KAPWR: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
-MI33	MOSFET	TE	TE_B	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	TE	SLEEP	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	SLEEPB	SLEEP	net108	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Z	net145	VGND	VNB	nshort	14	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net145	TEB_INT	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net145	A	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	net93	A	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net89	net90	net93	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net90	TEB_INT	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net90	net145	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	net146	net89	net73	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	net73	TE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	TEB_INT	TE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	net108	SLEEP	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	TEB_INT	TE	KAPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	TE	TE_B	net116	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net116	SLEEP	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	Z	net89	VPWR	VPB	phighvt	20	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	SLEEPB	SLEEP	VPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net146	net89	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net90	net145	net153	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	net148	SLEEP	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	net153	TEB_INT	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net89	A	net148	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net145	net146	net144	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	net144	A	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net146	TE	net136	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net89	TE	KAPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net146	SLEEPB	KAPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	net136	SLEEP	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	TE	TE_B	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	TE	SLEEP	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	SLEEPB	SLEEP	net108	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Z	net145	VGND	VNB	nfet_01v8	14	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net145	TEB_INT	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net145	A	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	net93	A	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net89	net90	net93	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net90	TEB_INT	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net90	net145	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	net146	net89	net73	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	net73	TE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	TEB_INT	TE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	net108	SLEEP	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	TEB_INT	TE	KAPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	TE	TE_B	net116	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net116	SLEEP	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Z	net89	VPWR	VPB	pfet_01v8_hvt	20	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	SLEEPB	SLEEP	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net146	net89	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net90	net145	net153	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	net148	SLEEP	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	net153	TEB_INT	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net89	A	net148	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net145	net146	net144	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	net144	A	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net146	TE	net136	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net89	TE	KAPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net146	SLEEPB	KAPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	net136	SLEEP	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/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.spice b/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.spice
index 2c829b6..ad36a97 100644
--- a/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.spice
+++ b/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.spice
@@ -17,152 +17,78 @@
 
 .subckt sky130_fd_sc_lp__busdrivernovlpsleep_20 A SLEEP TE_B KAPWR VGND VNB VPB VPWR
 + Z
-M1000 VGND a_1486_47# Z VNB nshort w=640000u l=150000u
-+  ad=4.1398e+12p pd=3.544e+07u as=1.44e+12p ps=1.474e+07u
-M1001 a_280_47# TE_B a_228_491# VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=1.344e+11p ps=1.7e+06u
-M1002 VGND SLEEP a_110_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1003 a_1486_47# A VGND VNB nshort w=840000u l=150000u
-+  ad=8.6985e+11p pd=5.64e+06u as=0p ps=0u
-M1004 Z a_705_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+12p pd=3.08e+07u as=5.8864e+12p ps=5.239e+07u
-M1005 a_2519_47# a_2063_47# a_705_367# VNB nshort w=840000u l=150000u
-+  ad=7.728e+11p pd=6.88e+06u as=2.352e+11p ps=2.24e+06u
-M1006 a_228_491# SLEEP VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A a_2519_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND TE_B a_280_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1009 Z a_1486_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_705_367# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 KAPWR a_280_47# a_705_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4337e+12p pd=1.05e+07u as=8.253e+11p ps=6.35e+06u
-M1012 a_1492_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0206e+12p pd=9.18e+06u as=0p ps=0u
-M1013 VGND SLEEP a_280_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_896_367# a_705_367# a_1053_47# VNB nshort w=420000u l=150000u
-+  ad=1.8275e+11p pd=1.86e+06u as=8.82e+10p ps=1.26e+06u
-M1015 VPWR SLEEP a_2345_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.0206e+12p ps=9.18e+06u
-M1016 a_705_367# A a_2345_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_705_367# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_2033_373# a_407_491# VPWR VPB phighvt w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1019 Z a_705_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_2063_47# a_407_491# VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1021 Z a_1486_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Z a_705_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1486_47# a_896_367# a_1492_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1024 VPWR a_705_367# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_1486_47# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR SLEEP a_27_47# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1027 VPWR a_705_367# a_896_367# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=5.88e+11p ps=5.32e+06u
-M1028 Z a_705_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND a_1486_47# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_110_47# SLEEP a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1031 Z a_705_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND a_1486_47# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR a_705_367# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR a_705_367# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 KAPWR a_280_47# a_407_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1036 KAPWR a_27_47# a_896_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1053_47# a_280_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1486_47# a_407_491# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 Z a_705_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_280_47# TE_B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_2519_47# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_705_367# a_280_47# KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 Z a_705_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VPWR A a_1492_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_280_47# SLEEP VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_2345_367# SLEEP VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VGND a_1486_47# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 Z a_1486_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 a_1172_451# SLEEP VPWR VPB phighvt w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1050 VGND a_407_491# a_1486_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 VPWR a_705_367# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 Z a_1486_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1053 VPWR a_705_367# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1054 Z a_705_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 a_705_367# a_2063_47# a_2519_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 Z a_1486_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 a_896_367# a_280_47# a_1172_451# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 VGND a_1486_47# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1059 Z a_1486_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1060 Z a_705_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1061 VPWR a_705_367# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1062 Z a_1486_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1063 VGND a_280_47# a_407_491# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1064 Z a_705_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1065 VGND a_1486_47# a_2063_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1066 a_896_367# a_27_47# KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1067 a_1492_367# a_896_367# a_1486_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1068 a_2063_47# a_1486_47# a_2033_373# VPB phighvt w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1069 a_2345_367# A a_705_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1070 VPWR a_705_367# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1071 VGND A a_1486_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1072 VPWR a_705_367# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1073 VGND a_1486_47# Z VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR SLEEP a_228_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 VPWR A a_1492_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR a_705_367# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 Z a_705_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 Z a_705_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_407_491# a_280_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_705_367# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_2519_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND a_1486_47# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 KAPWR a_280_47# a_705_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_896_367# a_27_47# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_280_47# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VGND a_280_47# a_1053_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_2345_367# SLEEP VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 Z a_1486_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 VPWR SLEEP a_1172_451# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 a_1172_451# a_280_47# a_896_367# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X17 VGND A a_1486_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 VGND a_407_491# a_2063_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_110_47# SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_1053_47# a_705_367# a_896_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 Z a_705_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 a_2519_47# a_2063_47# a_705_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_2033_373# a_1486_47# a_2063_47# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X24 a_27_47# SLEEP a_110_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 Z a_705_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 VGND A a_2519_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 a_705_367# a_2063_47# a_2519_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X28 a_705_367# A a_2345_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 Z a_705_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 VPWR a_705_367# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 a_228_491# TE_B a_280_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X32 a_2345_367# A a_705_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X33 VPWR a_705_367# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X34 VGND a_407_491# a_1486_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X35 Z a_1486_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X36 a_2063_47# a_1486_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 VGND a_1486_47# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X38 a_896_367# a_705_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X39 VGND a_1486_47# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X40 VGND SLEEP a_280_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X41 a_1486_47# a_407_491# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X42 VPWR a_705_367# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X43 a_1492_367# a_896_367# a_1486_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X44 VPWR a_705_367# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X45 VPWR a_705_367# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X46 Z a_705_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X47 Z a_1486_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X48 VGND a_1486_47# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X49 Z a_1486_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X50 Z a_1486_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X51 VGND a_1486_47# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X52 VPWR a_407_491# a_2033_373# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X53 a_280_47# SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X54 VPWR a_705_367# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X55 Z a_705_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X56 VGND a_1486_47# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X57 a_1492_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X58 Z a_705_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X59 Z a_1486_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X60 a_1486_47# a_896_367# a_1492_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X61 VGND TE_B a_280_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X62 Z a_705_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X63 KAPWR a_27_47# a_896_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X64 VPWR a_705_367# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X65 VGND a_1486_47# Z VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X66 a_27_47# SLEEP VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X67 a_705_367# a_280_47# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X68 VPWR SLEEP a_2345_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X69 a_1486_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X70 Z a_1486_47# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X71 VPWR a_705_367# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X72 a_407_491# a_280_47# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X73 Z a_705_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/bushold/sky130_fd_sc_lp__bushold_1.cdl b/cells/bushold/sky130_fd_sc_lp__bushold_1.cdl
index 873a82b..c1e10b7 100644
--- a/cells/bushold/sky130_fd_sc_lp__bushold_1.cdl
+++ b/cells/bushold/sky130_fd_sc_lp__bushold_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__bushold_1 RESET VGND VNB VPB VPWR X
 *.PININFO RESET:I VGND:I VNB:I VPB:I VPWR:I X:B
-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 X Ab VNB nshort m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MMIN2 X 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
-MI7 Ab RESET VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 Ab RESET VNB nfet_01v8 m=1 w=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 X VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+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 X Ab VPB pfet_01v8_hvt m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB phighvt m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net39 RESET VPB phighvt m=1 w=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 net39 RESET VPB pfet_01v8_hvt m=1 w=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_lp__bushold_1
diff --git a/cells/bushold/sky130_fd_sc_lp__bushold_1.netlist.tsv b/cells/bushold/sky130_fd_sc_lp__bushold_1.netlist.tsv
index f4ecc85..514d610 100644
--- a/cells/bushold/sky130_fd_sc_lp__bushold_1.netlist.tsv
+++ b/cells/bushold/sky130_fd_sc_lp__bushold_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__bushold_1	RESET:I VGND:I VNB:I VPB:I VPWR:I X:B
 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	X	Ab	VGND	VNB	nshort	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	Ab	RESET	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	X	net39	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	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net39	RESET	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	X	Ab	VGND	VNB	nfet_01v8	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	Ab	RESET	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Ab	X	net39	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	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net39	RESET	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/bushold/sky130_fd_sc_lp__bushold_1.spice b/cells/bushold/sky130_fd_sc_lp__bushold_1.spice
index 0eb8843..14d9ea0 100644
--- a/cells/bushold/sky130_fd_sc_lp__bushold_1.spice
+++ b/cells/bushold/sky130_fd_sc_lp__bushold_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__bushold_1 RESET VGND VNB VPB VPWR X
-M1000 VGND RESET a_89_535# VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=1.176e+11p ps=1.4e+06u
-M1001 X a_89_535# VPWR VPB phighvt w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.176e+11p ps=1.4e+06u
-M1002 a_172_535# X a_89_535# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1003 X a_89_535# VGND VNB nshort w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1004 VPWR RESET a_172_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_89_535# X VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_89_535# RESET VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND a_89_535# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=500000u
+X2 a_89_535# X a_172_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_172_535# RESET VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VPWR a_89_535# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=500000u
+X5 VGND X a_89_535# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/bushold0/sky130_fd_sc_lp__bushold0_1.cdl b/cells/bushold0/sky130_fd_sc_lp__bushold0_1.cdl
index c5caffb..c48ce66 100644
--- a/cells/bushold0/sky130_fd_sc_lp__bushold0_1.cdl
+++ b/cells/bushold0/sky130_fd_sc_lp__bushold0_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__bushold0_1 RESET VGND VNB VPB VPWR X
 *.PININFO RESET:I VGND:I VNB:I VPB:I VPWR:I X:B
-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 X Ab VNB nshort m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MMIN2 X 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
-MI9 X RESET VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 X RESET VNB nfet_01v8 m=1 w=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 X VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+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 X Ab VPB pfet_01v8_hvt m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB phighvt m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net038 RESET VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI8 net038 RESET VPB pfet_01v8_hvt m=1 w=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_lp__bushold0_1
diff --git a/cells/bushold0/sky130_fd_sc_lp__bushold0_1.netlist.tsv b/cells/bushold0/sky130_fd_sc_lp__bushold0_1.netlist.tsv
index af29b11..979fb81 100644
--- a/cells/bushold0/sky130_fd_sc_lp__bushold0_1.netlist.tsv
+++ b/cells/bushold0/sky130_fd_sc_lp__bushold0_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__bushold0_1	RESET:I VGND:I VNB:I VPB:I VPWR:I X:B
 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	X	Ab	VGND	VNB	nshort	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	X	RESET	VGND	VNB	nshort	1	0.42	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	X	Ab	net038	VPB	phighvt	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net038	RESET	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	X	Ab	VGND	VNB	nfet_01v8	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	X	RESET	VGND	VNB	nfet_01v8	1	0.42	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	X	Ab	net038	VPB	pfet_01v8_hvt	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net038	RESET	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/bushold0/sky130_fd_sc_lp__bushold0_1.spice b/cells/bushold0/sky130_fd_sc_lp__bushold0_1.spice
index ff60587..cdd7c8e 100644
--- a/cells/bushold0/sky130_fd_sc_lp__bushold0_1.spice
+++ b/cells/bushold0/sky130_fd_sc_lp__bushold0_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__bushold0_1 RESET VGND VNB VPB VPWR X
-M1000 X RESET VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.289e+11p ps=2.77e+06u
-M1001 X a_27_535# a_258_535# VPB phighvt w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1002 a_258_535# RESET VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.365e+11p ps=1.49e+06u
-M1003 VPWR X a_27_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=1.9e+06u
-M1004 VGND a_27_535# X VNB nshort w=420000u l=500000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND X a_27_535# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 VGND RESET X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_27_535# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=500000u
+X2 VPWR RESET a_258_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_27_535# X VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_258_535# a_27_535# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=500000u
+X5 a_27_535# X VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.cdl b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.cdl
index f162451..9d53540 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.cdl
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__busreceiver_0 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort 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.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 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
-MMIP2 X Ab 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
+MMIP1 Ab 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
+MMIP2 X Ab 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_lp__busreceiver_0
diff --git a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.netlist.tsv b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.netlist.tsv
index 57f30c6..6fc1d3c 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.netlist.tsv
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__busreceiver_0	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	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.42	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.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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.spice b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.spice
index 8c8c35d..312f6b7 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.spice
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__busreceiver_0 A VGND VNB VPB VPWR X
-M1000 a_70_157# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.428e+11p ps=1.52e+06u
-M1001 VPWR a_70_157# X VPB phighvt w=640000u l=150000u
-+  ad=2.011e+11p pd=1.96e+06u as=1.696e+11p ps=1.81e+06u
-M1002 a_70_157# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1003 VGND a_70_157# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 X a_70_157# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_70_157# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 VPWR A a_70_157# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VGND A a_70_157# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.cdl b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.cdl
index c66f6a0..7382a05 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.cdl
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__busreceiver_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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab A 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
-MMIP2 X Ab VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab A VPB pfet_01v8_hvt m=1 w=0.64 l=0.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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__busreceiver_1
diff --git a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.netlist.tsv b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.netlist.tsv
index 309d64d..9dd13a1 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.netlist.tsv
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__busreceiver_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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	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.84	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.spice b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.spice
index cf7a898..f533deb 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.spice
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__busreceiver_1 A VGND VNB VPB VPWR X
-M1000 a_70_237# A VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=3.819e+11p ps=3.2e+06u
-M1001 VGND a_70_237# X VNB nshort w=840000u l=150000u
-+  ad=2.541e+11p pd=2.36e+06u as=2.226e+11p ps=2.21e+06u
-M1002 a_70_237# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1003 VPWR a_70_237# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 VPWR A a_70_237# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 X a_70_237# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 X a_70_237# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND A a_70_237# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.cdl b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.cdl
index d80141a..91260bd 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.cdl
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__busreceiver_m 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort 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.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 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
-MMIP2 X Ab VPB phighvt m=1 w=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 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
+MMIP2 X Ab VPB pfet_01v8_hvt m=1 w=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_lp__busreceiver_m
diff --git a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.netlist.tsv b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.netlist.tsv
index 6b15a6e..55cc1c2 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.netlist.tsv
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__busreceiver_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	Ab	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	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.42	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.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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.spice b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.spice
index 5edfd4e..bb227aa 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.spice
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__busreceiver_m A VGND VNB VPB VPWR X
-M1000 VGND a_47_178# X VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.113e+11p ps=1.37e+06u
-M1001 a_47_178# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.176e+11p ps=1.4e+06u
-M1002 a_47_178# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1003 VPWR a_47_178# X VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 X a_47_178# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_47_178# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VGND A a_47_178# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR A a_47_178# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.cdl b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.cdl
index 199ee9f..3cb5606 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.cdl
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__clkbuf_0 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=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 X Ab 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
+MMIP0 Ab A 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
+MMIP1 X Ab 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_lp__clkbuf_0
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.netlist.tsv b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.netlist.tsv
index b67d2ae..4dc4c9f 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__clkbuf_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	1	0.64	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	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/clkbuf/sky130_fd_sc_lp__clkbuf_0.spice b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.spice
index 43c18c4..9dcbadc 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.spice
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__clkbuf_0 A VGND VNB VPB VPWR X
-M1000 a_70_157# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.428e+11p ps=1.52e+06u
-M1001 VPWR a_70_157# X VPB phighvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=1.696e+11p ps=1.81e+06u
-M1002 VGND a_70_157# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1003 a_70_157# A VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
+X0 X a_70_157# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR A a_70_157# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 X a_70_157# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 VGND A a_70_157# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.cdl b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.cdl
index 2dda442..56b4e49 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.cdl
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__clkbuf_1
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.netlist.tsv b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.netlist.tsv
index 0aa5d34..35e71b1 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	1	1.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.spice b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.spice
index 1fbe445..c805c92 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.spice
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__clkbuf_1 A VGND VNB VPB VPWR X
-M1000 a_69_161# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=3.528e+11p ps=3.08e+06u
-M1001 VGND a_69_161# X VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=1.113e+11p ps=1.37e+06u
-M1002 a_69_161# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1003 VPWR a_69_161# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 VGND A a_69_161# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR A a_69_161# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 X a_69_161# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 X a_69_161# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.cdl b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.cdl
index 911c3ea..2688ca3 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.cdl
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__clkbuf_16
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.netlist.tsv b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.netlist.tsv
index 3a1aca8..122a4c5 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	16	1.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.spice b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.spice
index 169b810..f7a45da 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.spice
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__clkbuf_16 A VGND VNB VPB VPWR X
-M1000 VPWR a_116_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.3722e+12p pd=3.466e+07u as=2.8224e+12p ps=2.464e+07u
-M1001 VGND a_116_47# X VNB nshort w=420000u l=150000u
-+  ad=1.4574e+12p pd=1.618e+07u as=9.408e+11p ps=1.12e+07u
-M1002 X a_116_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND a_116_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A a_116_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1005 VGND a_116_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_116_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_116_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_116_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_116_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_116_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_116_47# A VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=0p ps=0u
-M1012 X a_116_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_116_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_116_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_116_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_116_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_116_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_116_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_116_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_116_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_116_47# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_116_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_116_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_116_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_116_47# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND A a_116_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_116_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 X a_116_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_116_47# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND A a_116_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND a_116_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR a_116_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 X a_116_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 X a_116_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR A a_116_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 X a_116_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR a_116_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 X a_116_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_116_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_116_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 X a_116_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_116_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 X a_116_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND a_116_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND A a_116_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_116_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 X a_116_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 X a_116_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 X a_116_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VPWR a_116_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VGND a_116_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 X a_116_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 VGND A a_116_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VPWR a_116_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VPWR a_116_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 X a_116_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND a_116_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VPWR a_116_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VPWR a_116_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 X a_116_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 VGND a_116_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 X a_116_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VPWR A a_116_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 VPWR a_116_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 VPWR A a_116_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 VPWR a_116_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 X a_116_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 VGND a_116_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_116_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 X a_116_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 a_116_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 VPWR a_116_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X33 X a_116_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 X a_116_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 VGND a_116_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 VGND a_116_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 X a_116_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 X a_116_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X39 VGND a_116_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.cdl b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.cdl
index 043b84c..154d9ed 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.cdl
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__clkbuf_2
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.netlist.tsv b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.netlist.tsv
index 9dd5aa4..9d0d76b 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	2	1.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.spice b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.spice
index 720557d..1a9f420 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.spice
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__clkbuf_2 A VGND VNB VPB VPWR X
-M1000 VPWR a_27_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.497e+11p pd=6.23e+06u as=3.528e+11p ps=3.08e+06u
-M1001 X a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.52e+11p ps=2.88e+06u
-M1002 VGND A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1003 X a_27_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_27_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A a_27_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.cdl b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.cdl
index 005d660..0b4360b 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.cdl
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__clkbuf_4
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.netlist.tsv b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.netlist.tsv
index 26d89ce..a4dcb3b 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	4	1.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.spice b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.spice
index 4ec2520..f961755 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.spice
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__clkbuf_4 A VGND VNB VPB VPWR X
-M1000 VPWR a_27_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.1466e+12p pd=9.38e+06u as=7.056e+11p ps=6.16e+06u
-M1001 X a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=3.801e+11p ps=4.33e+06u
-M1002 X a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_27_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 VGND a_27_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_27_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_27_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_27_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A a_27_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.cdl b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.cdl
index 4b3d885..f2e9c76 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.cdl
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__clkbuf_8
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.netlist.tsv b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.netlist.tsv
index afc3b6d..01934d7 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	8	1.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.spice b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.spice
index f31a331..f100ef1 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.spice
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__clkbuf_8 A VGND VNB VPB VPWR X
-M1000 X a_110_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=2.079e+12p ps=1.842e+07u
-M1001 VPWR a_110_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 X a_110_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND a_110_47# X VNB nshort w=420000u l=150000u
-+  ad=6.951e+11p pd=8.35e+06u as=4.704e+11p ps=5.6e+06u
-M1004 X a_110_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_110_47# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1006 VPWR A a_110_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1007 X a_110_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_110_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_110_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_110_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A a_110_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_110_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_110_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_110_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_110_47# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_110_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_110_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_110_47# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_110_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_110_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_110_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND a_110_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_110_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND A a_110_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_110_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_110_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 X a_110_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR A a_110_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR a_110_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR a_110_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 X a_110_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VPWR a_110_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 VPWR a_110_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 X a_110_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_110_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VGND a_110_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 X a_110_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VGND a_110_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 X a_110_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.cdl b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.cdl
index ec883ff..bc6fc04 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.cdl
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__clkbuf_lp 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
-MI5 net29 Ab VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI5 net29 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
-MI4 net25 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI4 net25 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 Ab A 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
-MMIP1 X Ab 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
+MMIP0 Ab A 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
+MMIP1 X 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
 .ENDS sky130_fd_sc_lp__clkbuf_lp
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.netlist.tsv b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.netlist.tsv
index d04128b..41ce0bf 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.netlist.tsv
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__clkbuf_lp	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	net25	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	Ab	net29	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net29	Ab	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	net25	A	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Ab	A	net25	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	Ab	net29	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net29	Ab	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	net25	A	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	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/clkbuf/sky130_fd_sc_lp__clkbuf_lp.spice b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.spice
index 6179371..1494347 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.spice
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__clkbuf_lp A VGND VNB VPB VPWR X
-M1000 a_124_57# a_94_31# X VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1001 a_94_31# A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=5.25e+11p ps=3.05e+06u
-M1002 a_312_57# A VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.806e+11p ps=1.7e+06u
-M1003 a_94_31# A a_312_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1004 VPWR a_94_31# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1005 VGND a_94_31# a_124_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A a_312_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR A a_94_31# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_124_57# a_94_31# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 X a_94_31# a_124_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_312_57# A a_94_31# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_94_31# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.cdl b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.cdl
index b06aa98..6ac744d 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.cdl
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__clkbuflp_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.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Ab A VNB nfet_01v8 m=4 w=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 Ab VNB nshort m=10 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X Ab VNB nfet_01v8 m=10 w=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 net29 Ab VNB nshort m=10 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI5 net29 Ab VNB nfet_01v8 m=10 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 net25 A VNB nshort m=4 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI4 net25 A VNB nfet_01v8 m=4 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 Ab A VPB phighvt m=6 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIP0 Ab A VPB pfet_01v8_hvt m=6 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
-MMIP1 X Ab VPB phighvt m=16 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
+MMIP1 X Ab VPB pfet_01v8_hvt m=16 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
 .ENDS sky130_fd_sc_lp__clkbuflp_16
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.netlist.tsv b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.netlist.tsv
index ec3b420..0e4810a 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.netlist.tsv
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__clkbuflp_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	net25	VNB	nshort	4	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	Ab	net29	VNB	nshort	10	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net29	Ab	VGND	VNB	nshort	10	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	net25	A	VGND	VNB	nshort	4	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	Ab	A	VPWR	VPB	phighvt	6	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	16	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Ab	A	net25	VNB	nfet_01v8	4	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	Ab	net29	VNB	nfet_01v8	10	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net29	Ab	VGND	VNB	nfet_01v8	10	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	net25	A	VGND	VNB	nfet_01v8	4	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	6	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	16	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.spice b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.spice
index f02a747..f10629e 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.spice
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.spice
@@ -16,104 +16,54 @@
 
 
 .subckt sky130_fd_sc_lp__clkbuflp_16 A VGND VNB VPB VPWR X
-M1000 X a_130_417# a_1378_47# VNB nshort w=550000u l=150000u
-+  ad=7.7e+11p pd=8.3e+06u as=1.155e+11p ps=1.52e+06u
-M1001 X a_130_417# a_2010_47# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.52e+06u
-M1002 a_130_417# A a_110_47# VNB nshort w=550000u l=150000u
-+  ad=3.08e+11p pd=3.32e+06u as=1.155e+11p ps=1.52e+06u
-M1003 a_1852_47# a_130_417# X VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=0p ps=0u
-M1004 VPWR a_130_417# X VPB phighvt w=1e+06u l=250000u
-+  ad=3.33e+12p pd=3.066e+07u as=2.24e+12p ps=2.048e+07u
-M1005 VPWR A a_130_417# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=8.4e+11p ps=7.68e+06u
-M1006 X a_130_417# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_584_47# A a_130_417# VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=0p ps=0u
-M1008 a_2010_47# a_130_417# VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.2265e+12p ps=1.326e+07u
-M1009 VGND A a_584_47# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1378_47# a_130_417# VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_746_47# a_130_417# VGND VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=0p ps=0u
-M1012 VPWR a_130_417# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_130_417# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_904_47# a_130_417# X VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=0p ps=0u
-M1015 VGND a_130_417# a_1536_47# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.52e+06u
-M1016 VPWR A a_130_417# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_130_417# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_110_47# A VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_130_417# a_904_47# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_130_417# a_2168_47# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.52e+06u
-M1021 VGND A a_268_47# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.52e+06u
-M1022 X a_130_417# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR a_130_417# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1062_47# a_130_417# VGND VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=0p ps=0u
-M1025 a_130_417# A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_130_417# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 X a_130_417# a_1062_47# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1220_47# a_130_417# X VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=0p ps=0u
-M1029 VPWR A a_130_417# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1536_47# a_130_417# X VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND a_130_417# a_1220_47# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_2168_47# a_130_417# X VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_268_47# A a_130_417# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1694_47# a_130_417# VGND VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=0p ps=0u
-M1035 a_426_47# A VGND VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=0p ps=0u
-M1036 X a_130_417# a_1694_47# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 X a_130_417# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_130_417# A a_426_47# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 X a_130_417# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VGND a_130_417# a_1852_47# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VPWR a_130_417# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VPWR a_130_417# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VPWR a_130_417# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 X a_130_417# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 X a_130_417# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_130_417# A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 a_130_417# A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 X a_130_417# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 X a_130_417# a_746_47# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_130_417# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_1536_47# a_130_417# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X2 a_2010_47# a_130_417# X VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X3 a_130_417# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 VGND a_130_417# a_1694_47# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X5 X a_130_417# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 VPWR a_130_417# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_110_47# A a_130_417# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X8 VGND a_130_417# a_1062_47# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X9 VPWR A a_130_417# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 VPWR a_130_417# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 VGND A a_110_47# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X12 VPWR A a_130_417# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X13 a_426_47# A a_130_417# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X14 VGND a_130_417# a_1378_47# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X15 a_130_417# A a_584_47# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X16 X a_130_417# a_2168_47# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X17 X a_130_417# a_1220_47# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X18 X a_130_417# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X19 VPWR A a_130_417# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X20 X a_130_417# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X21 VPWR a_130_417# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X22 a_130_417# A a_268_47# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X23 VPWR a_130_417# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X24 VPWR a_130_417# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X25 VPWR a_130_417# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X26 VGND A a_426_47# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X27 a_904_47# a_130_417# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X28 a_130_417# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X29 X a_130_417# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X30 a_1378_47# a_130_417# X VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X31 X a_130_417# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X32 a_1694_47# a_130_417# X VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X33 a_2168_47# a_130_417# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X34 X a_130_417# a_1852_47# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X35 VGND a_130_417# a_746_47# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X36 VPWR a_130_417# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X37 a_1062_47# a_130_417# X VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X38 VPWR a_130_417# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X39 a_268_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X40 a_1852_47# a_130_417# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X41 a_746_47# a_130_417# X VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X42 VGND a_130_417# a_2010_47# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X43 a_130_417# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X44 a_584_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X45 X a_130_417# a_904_47# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X46 X a_130_417# a_1536_47# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X47 X a_130_417# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X48 X a_130_417# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X49 a_1220_47# a_130_417# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
 .ends
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.cdl b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.cdl
index b14b809..995c7d0 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.cdl
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__clkbuflp_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
-MI5 net29 Ab VNB nshort m=2 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI5 net29 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
-MI4 net25 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI4 net25 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 Ab A 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
-MMIP1 X Ab VPB phighvt m=2 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIP0 Ab A 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
+MMIP1 X Ab VPB pfet_01v8_hvt m=2 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__clkbuflp_2
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.netlist.tsv b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.netlist.tsv
index d313698..05a402a 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.netlist.tsv
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__clkbuflp_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	net25	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	Ab	net29	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net29	Ab	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	net25	A	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	2	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Ab	A	net25	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	Ab	net29	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net29	Ab	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	net25	A	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.spice b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.spice
index 0202b92..165c89e 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.spice
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.spice
@@ -16,22 +16,13 @@
 
 
 .subckt sky130_fd_sc_lp__clkbuflp_2 A VGND VNB VPB VPWR X
-M1000 VGND A a_110_47# VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VPWR A a_27_47# VPB phighvt w=1e+06u l=250000u
-+  ad=5.45e+11p pd=5.09e+06u as=2.65e+11p ps=2.53e+06u
-M1002 VPWR a_27_47# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1003 a_110_47# A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 X a_27_47# a_268_47# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=8.82e+10p ps=1.26e+06u
-M1005 a_268_47# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_426_47# a_27_47# X VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1007 VGND a_27_47# a_426_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_27_47# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_110_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_27_47# A a_110_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_426_47# a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 VGND a_27_47# a_268_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 X a_27_47# a_426_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_268_47# a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.cdl b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.cdl
index 6a2b786..a8b2ae4 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.cdl
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__clkbuflp_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.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 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
-MMIN1 X Ab VNB nshort m=2 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X Ab VNB nfet_01v8 m=2 w=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 net29 Ab VNB nshort m=2 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI5 net29 Ab VNB nfet_01v8 m=2 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 net25 A VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI4 net25 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
-MMIP0 Ab A VPB phighvt m=2 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIP0 Ab A VPB pfet_01v8_hvt m=2 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X Ab VPB phighvt m=4 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8_hvt m=4 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__clkbuflp_4
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.netlist.tsv b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.netlist.tsv
index 951a81f..986b932 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.netlist.tsv
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__clkbuflp_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	net25	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	Ab	net29	VNB	nshort	2	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net29	Ab	VGND	VNB	nshort	2	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	net25	A	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	Ab	A	VPWR	VPB	phighvt	2	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	4	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Ab	A	net25	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	Ab	net29	VNB	nfet_01v8	2	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net29	Ab	VGND	VNB	nfet_01v8	2	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	net25	A	VGND	VNB	nfet_01v8	1	0.64	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.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.spice b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.spice
index 13d4c2f..bc1d034 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.spice
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__clkbuflp_4 A VGND VNB VPB VPWR X
-M1000 a_130_417# A a_110_47# VNB nshort w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=1.344e+11p ps=1.7e+06u
-M1001 VPWR a_130_417# X VPB phighvt w=1e+06u l=250000u
-+  ad=1.09e+12p pd=1.018e+07u as=5.6e+11p ps=5.12e+06u
-M1002 a_372_47# a_130_417# VGND VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=4.611e+11p ps=5.07e+06u
-M1003 X a_130_417# a_372_47# VNB nshort w=550000u l=150000u
-+  ad=1.54e+11p pd=1.66e+06u as=0p ps=0u
-M1004 VGND a_130_417# a_530_47# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.52e+06u
-M1005 VPWR A a_130_417# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1006 a_110_47# A VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_530_47# a_130_417# X VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_130_417# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_130_417# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_130_417# A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_130_417# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_130_417# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_110_47# A a_130_417# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 VPWR A a_130_417# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 VGND A a_110_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 VPWR a_130_417# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_372_47# a_130_417# X VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X6 VPWR a_130_417# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 X a_130_417# a_530_47# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X8 a_530_47# a_130_417# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X9 a_130_417# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 VGND a_130_417# a_372_47# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X11 X a_130_417# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.cdl b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.cdl
index 1511cbc..59db3e7 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.cdl
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__clkbuflp_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.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 Ab 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 Ab VNB nshort m=4 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 X Ab VNB nfet_01v8 m=4 w=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 net29 Ab VNB nshort m=4 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI5 net29 Ab VNB nfet_01v8 m=4 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 net25 A VNB nshort m=2 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI4 net25 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
-MMIP0 Ab A VPB phighvt m=4 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIP0 Ab A VPB pfet_01v8_hvt m=4 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 X Ab VPB phighvt m=8 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8_hvt m=8 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
 .ENDS sky130_fd_sc_lp__clkbuflp_8
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.netlist.tsv b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.netlist.tsv
index dc7c501..b6eb5c4 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.netlist.tsv
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__clkbuflp_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	net25	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	X	Ab	net29	VNB	nshort	4	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net29	Ab	VGND	VNB	nshort	4	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	net25	A	VGND	VNB	nshort	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	Ab	A	VPWR	VPB	phighvt	4	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	8	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Ab	A	net25	VNB	nfet_01v8	2	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	X	Ab	net29	VNB	nfet_01v8	4	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net29	Ab	VGND	VNB	nfet_01v8	4	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	net25	A	VGND	VNB	nfet_01v8	2	0.64	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.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	8	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.spice b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.spice
index e897c5f..3db079d 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.spice
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_lp__clkbuflp_8 A VGND VNB VPB VPWR X
-M1000 X a_130_417# a_534_47# VNB nshort w=550000u l=150000u
-+  ad=3.08e+11p pd=3.32e+06u as=1.155e+11p ps=1.52e+06u
-M1001 a_130_417# A a_110_47# VNB nshort w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=1.344e+11p ps=1.7e+06u
-M1002 a_1008_47# a_130_417# X VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=0p ps=0u
-M1003 VPWR a_130_417# X VPB phighvt w=1e+06u l=250000u
-+  ad=1.93e+12p pd=1.786e+07u as=1.12e+12p ps=1.024e+07u
-M1004 VPWR a_130_417# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_534_47# a_130_417# VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=9.442e+11p ps=8.02e+06u
-M1006 a_692_47# a_130_417# X VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=0p ps=0u
-M1007 VPWR A a_130_417# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=5.6e+11p ps=5.12e+06u
-M1008 VPWR a_130_417# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_110_47# A VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_130_417# a_692_47# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A a_268_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.7e+06u
-M1012 X a_130_417# a_850_47# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.52e+06u
-M1013 X a_130_417# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_130_417# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A a_130_417# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_130_417# a_1008_47# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_268_47# A a_130_417# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_130_417# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_850_47# a_130_417# VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_130_417# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_130_417# A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_130_417# A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_130_417# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_692_47# a_130_417# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X1 X a_130_417# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 VGND a_130_417# a_850_47# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X3 a_850_47# a_130_417# X VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X4 a_110_47# A a_130_417# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 VPWR A a_130_417# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 VPWR a_130_417# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 VGND A a_110_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 VGND a_130_417# a_534_47# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X9 VPWR a_130_417# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 a_534_47# a_130_417# X VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X11 X a_130_417# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 X a_130_417# a_692_47# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X13 VPWR A a_130_417# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X14 X a_130_417# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X15 a_1008_47# a_130_417# VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X16 X a_130_417# a_1008_47# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X17 a_130_417# A a_268_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 VPWR a_130_417# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X19 a_130_417# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X20 X a_130_417# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X21 VPWR a_130_417# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X22 a_268_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X23 a_130_417# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.cdl b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.cdl
index 197f3be..ebbff2c 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.cdl
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__clkdlybuf4s15_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP1 X Ab VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 net53 A VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net49 net53 VPB pfet_01v8_hvt m=1 w=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 Ab net49 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 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 net53 A VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 net53 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
-MI10 net49 net53 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 Ab net49 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
-MI7 X Ab VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN0 net53 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 net49 net53 VNB nshort m=1 w=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 Ab net49 VNB nshort m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 net49 net53 VNB nfet_01v8 m=1 w=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 Ab net49 VNB nfet_01v8 m=1 w=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_lp__clkdlybuf4s15_1
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.netlist.tsv b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.netlist.tsv
index 7b34faa..b4ba1cf 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.netlist.tsv
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__clkdlybuf4s15_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
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	net53	A	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net49	net53	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Ab	net49	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	X	Ab	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	net53	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net49	net53	VGND	VNB	nshort	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Ab	net49	VGND	VNB	nshort	1	1.0	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	net53	A	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net49	net53	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Ab	net49	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	X	Ab	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	net53	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net49	net53	VGND	VNB	nfet_01v8	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Ab	net49	VGND	VNB	nfet_01v8	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.spice b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.spice
index 075d6ae..8718f6d 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.spice
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__clkdlybuf4s15_1 A VGND VNB VPB VPWR X
-M1000 X a_394_52# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=1.55e+12p ps=7.88e+06u
-M1001 a_282_52# a_27_52# VGND VNB nshort w=1e+06u l=150000u
-+  ad=2.65e+11p pd=2.53e+06u as=1.2924e+12p ps=6.84e+06u
-M1002 VPWR a_282_52# a_394_52# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1003 a_282_52# a_27_52# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1004 VGND A a_27_52# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 X a_394_52# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 VGND a_282_52# a_394_52# VNB nshort w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1007 VPWR A a_27_52# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 VGND a_27_52# a_282_52# VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=150000u
+X1 a_394_52# a_282_52# VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=150000u
+X2 a_27_52# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_27_52# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_394_52# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR a_394_52# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_394_52# a_282_52# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 VPWR a_27_52# a_282_52# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.cdl b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.cdl
index d825fee..f3d1fca 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.cdl
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__clkdlybuf4s15_2 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP1 X Ab VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 net53 A VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net49 net53 VPB pfet_01v8_hvt m=1 w=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 Ab net49 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 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 net53 A VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 net53 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
-MI10 net49 net53 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 Ab net49 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
-MI7 X Ab VNB nshort 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
-MMIN0 net53 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 net49 net53 VNB nshort m=1 w=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 Ab net49 VNB nshort m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 net49 net53 VNB nfet_01v8 m=1 w=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 Ab net49 VNB nfet_01v8 m=1 w=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_lp__clkdlybuf4s15_2
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.netlist.tsv b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.netlist.tsv
index 777beb4..81b30aa 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.netlist.tsv
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__clkdlybuf4s15_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
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	net53	A	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net49	net53	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Ab	net49	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	X	Ab	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	net53	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net49	net53	VGND	VNB	nshort	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Ab	net49	VGND	VNB	nshort	1	1.0	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	net53	A	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net49	net53	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Ab	net49	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	X	Ab	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	net53	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net49	net53	VGND	VNB	nfet_01v8	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Ab	net49	VGND	VNB	nfet_01v8	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.spice b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.spice
index 10a5b6a..97acff4 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.spice
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__clkdlybuf4s15_2 A VGND VNB VPB VPWR X
-M1000 VGND a_394_52# X VNB nshort w=420000u l=150000u
-+  ad=1.4646e+12p pd=8.5e+06u as=1.176e+11p ps=1.4e+06u
-M1001 X a_394_52# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=2.0666e+12p ps=1.122e+07u
-M1002 a_282_52# a_27_52# VGND VNB nshort w=1e+06u l=150000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1003 VPWR a_282_52# a_394_52# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1004 a_282_52# a_27_52# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1005 VGND A a_27_52# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 X a_394_52# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_394_52# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_282_52# a_394_52# VNB nshort w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1009 VPWR A a_27_52# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 VGND a_27_52# a_282_52# VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=150000u
+X1 a_394_52# a_282_52# VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=150000u
+X2 a_27_52# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_27_52# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_394_52# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_394_52# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_394_52# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_394_52# a_282_52# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 X a_394_52# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR a_27_52# a_282_52# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.cdl b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.cdl
index 0dbd631..43ded55 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.cdl
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__clkdlybuf4s18_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP1 X Ab VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 net53 A VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net49 net53 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI12 Ab net49 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 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 net53 A VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 net53 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
-MI10 net49 net53 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 Ab net49 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 X Ab VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN0 net53 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 net49 net53 VNB nshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 Ab net49 VNB nshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI9 net49 net53 VNB nfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 Ab net49 VNB nfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__clkdlybuf4s18_1
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.netlist.tsv b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.netlist.tsv
index 5af1522..daaff59 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.netlist.tsv
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__clkdlybuf4s18_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
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	net53	A	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net49	net53	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Ab	net49	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	X	Ab	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	net53	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net49	net53	VGND	VNB	nshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Ab	net49	VGND	VNB	nshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	net53	A	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net49	net53	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Ab	net49	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	X	Ab	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	net53	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net49	net53	VGND	VNB	nfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Ab	net49	VGND	VNB	nfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.spice b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.spice
index dc02737..c4d6e17 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.spice
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__clkdlybuf4s18_1 A VGND VNB VPB VPWR X
-M1000 a_282_52# a_27_52# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.65e+11p pd=2.53e+06u as=1.49e+12p ps=7.76e+06u
-M1001 X a_394_52# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1002 VPWR a_282_52# a_394_52# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1003 a_282_52# a_27_52# VGND VNB nshort w=1e+06u l=180000u
-+  ad=2.65e+11p pd=2.53e+06u as=1.2324e+12p ps=6.72e+06u
-M1004 VGND A a_27_52# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 X a_394_52# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 VGND a_282_52# a_394_52# VNB nshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1007 VPWR A a_27_52# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 VGND a_27_52# a_282_52# VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=180000u
+X1 a_394_52# a_282_52# VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=180000u
+X2 a_27_52# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR a_27_52# a_282_52# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_27_52# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_394_52# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_394_52# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_394_52# a_282_52# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.cdl b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.cdl
index e795072..a9e539e 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.cdl
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__clkdlybuf4s18_2 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP1 X Ab VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 net53 A VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net49 net53 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI12 Ab net49 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 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 net53 A VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 net53 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
-MI10 net49 net53 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 Ab net49 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 X Ab VNB nshort 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
-MMIN0 net53 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 net49 net53 VNB nshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 Ab net49 VNB nshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI9 net49 net53 VNB nfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 Ab net49 VNB nfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__clkdlybuf4s18_2
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.netlist.tsv b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.netlist.tsv
index bf2034f..15f6104 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.netlist.tsv
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__clkdlybuf4s18_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
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	net53	A	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net49	net53	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Ab	net49	VPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	X	Ab	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	net53	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net49	net53	VGND	VNB	nshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Ab	net49	VGND	VNB	nshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	net53	A	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net49	net53	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Ab	net49	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	X	Ab	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	net53	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net49	net53	VGND	VNB	nfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Ab	net49	VGND	VNB	nfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.spice b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.spice
index da1b94b..c73044f 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.spice
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__clkdlybuf4s18_2 A VGND VNB VPB VPWR X
-M1000 a_282_52# a_27_52# VPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.65e+11p pd=2.53e+06u as=2.0066e+12p ps=1.11e+07u
-M1001 VGND a_394_52# X VNB nshort w=420000u l=150000u
-+  ad=1.4046e+12p pd=8.38e+06u as=1.176e+11p ps=1.4e+06u
-M1002 X a_394_52# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1003 VPWR a_282_52# a_394_52# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1004 a_282_52# a_27_52# VGND VNB nshort w=1e+06u l=180000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1005 VGND A a_27_52# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 X a_394_52# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_394_52# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_282_52# a_394_52# VNB nshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1009 VPWR A a_27_52# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 VGND a_27_52# a_282_52# VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=180000u
+X1 a_394_52# a_282_52# VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=180000u
+X2 a_27_52# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR a_27_52# a_282_52# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_27_52# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_394_52# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 X a_394_52# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_394_52# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_394_52# a_282_52# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 X a_394_52# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.cdl b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.cdl
index 10bc507..cd91d01 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.cdl
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__clkdlybuf4s25_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP1 X Ab VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 net53 A VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net49 net53 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
+MI12 Ab net49 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
+MI7 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 net53 A VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 net53 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
-MI10 net49 net53 VPB phighvt 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
-MI12 Ab net49 VPB phighvt 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
-MI7 X Ab VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN0 net53 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 net49 net53 VNB nshort 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
-MI11 Ab net49 VNB nshort m=1 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
+MI9 net49 net53 VNB nfet_01v8 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
+MI11 Ab net49 VNB nfet_01v8 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
 .ENDS sky130_fd_sc_lp__clkdlybuf4s25_1
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.netlist.tsv b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.netlist.tsv
index 2e92dc5..eda069b 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.netlist.tsv
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__clkdlybuf4s25_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
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	net53	A	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net49	net53	VPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Ab	net49	VPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	X	Ab	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	net53	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net49	net53	VGND	VNB	nshort	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Ab	net49	VGND	VNB	nshort	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	net53	A	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net49	net53	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Ab	net49	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	X	Ab	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	net53	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net49	net53	VGND	VNB	nfet_01v8	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Ab	net49	VGND	VNB	nfet_01v8	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.spice b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.spice
index 3538929..9098d29 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.spice
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__clkdlybuf4s25_1 A VGND VNB VPB VPWR X
-M1000 X a_394_52# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=1.35e+12p ps=7.48e+06u
-M1001 VPWR a_282_52# a_394_52# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1002 a_282_52# a_27_52# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1003 VGND A a_27_52# VNB nshort w=420000u l=150000u
-+  ad=1.0924e+12p pd=6.44e+06u as=1.113e+11p ps=1.37e+06u
-M1004 a_282_52# a_27_52# VGND VNB nshort w=1e+06u l=250000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1005 X a_394_52# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 VGND a_282_52# a_394_52# VNB nshort w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1007 VPWR A a_27_52# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 a_394_52# a_282_52# VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=250000u
+X1 a_27_52# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR a_27_52# a_282_52# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_27_52# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_27_52# a_282_52# VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=250000u
+X5 VGND a_394_52# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_394_52# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_394_52# a_282_52# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.cdl b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.cdl
index f194e18..08691cd 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.cdl
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__clkdlybuf4s25_2 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP1 X Ab VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 net53 A VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net49 net53 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
+MI12 Ab net49 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
+MI7 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 net53 A VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 net53 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
-MI10 net49 net53 VPB phighvt 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
-MI12 Ab net49 VPB phighvt 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
-MI7 X Ab VNB nshort 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
-MMIN0 net53 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 net49 net53 VNB nshort 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
-MI11 Ab net49 VNB nshort m=1 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
+MI9 net49 net53 VNB nfet_01v8 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
+MI11 Ab net49 VNB nfet_01v8 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
 .ENDS sky130_fd_sc_lp__clkdlybuf4s25_2
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.netlist.tsv b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.netlist.tsv
index ff876e0..92900aa 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.netlist.tsv
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__clkdlybuf4s25_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
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	net53	A	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net49	net53	VPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Ab	net49	VPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	X	Ab	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	net53	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net49	net53	VGND	VNB	nshort	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Ab	net49	VGND	VNB	nshort	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	net53	A	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net49	net53	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Ab	net49	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	X	Ab	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	net53	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net49	net53	VGND	VNB	nfet_01v8	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Ab	net49	VGND	VNB	nfet_01v8	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.spice b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.spice
index 3a7bd83..0d4ba14 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.spice
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__clkdlybuf4s25_2 A VGND VNB VPB VPWR X
-M1000 VGND a_394_52# X VNB nshort w=420000u l=150000u
-+  ad=1.2646e+12p pd=8.1e+06u as=1.176e+11p ps=1.4e+06u
-M1001 X a_394_52# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=1.8666e+12p ps=1.082e+07u
-M1002 VPWR a_282_52# a_394_52# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1003 a_282_52# a_27_52# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1004 VGND A a_27_52# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 a_282_52# a_27_52# VGND VNB nshort w=1e+06u l=250000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1006 X a_394_52# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_394_52# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_282_52# a_394_52# VNB nshort w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1009 VPWR A a_27_52# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 a_394_52# a_282_52# VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=250000u
+X1 a_27_52# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR a_27_52# a_282_52# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_27_52# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_27_52# a_282_52# VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=250000u
+X5 VGND a_394_52# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 X a_394_52# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_394_52# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_394_52# a_282_52# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 X a_394_52# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.cdl b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.cdl
index cdd22f5..c09a461 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.cdl
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__clkdlybuf4s50_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP1 X Ab VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 net53 A VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net49 net53 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
+MI12 Ab net49 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
+MI7 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 net53 A VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 net53 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
-MI10 net49 net53 VPB phighvt m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
+MI9 net49 net53 VNB nfet_01v8 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
-MI12 Ab net49 VPB phighvt 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
-MI7 X Ab VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN0 net53 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 net49 net53 VNB nshort 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
-MI11 Ab net49 VNB nshort m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
+MI11 Ab net49 VNB nfet_01v8 m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__clkdlybuf4s50_1
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.netlist.tsv b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.netlist.tsv
index 0ebf842..4587e5e 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.netlist.tsv
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__clkdlybuf4s50_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
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	net53	A	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net49	net53	VPWR	VPB	phighvt	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Ab	net49	VPWR	VPB	phighvt	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	X	Ab	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	net53	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net49	net53	VGND	VNB	nshort	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Ab	net49	VGND	VNB	nshort	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	net53	A	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net49	net53	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Ab	net49	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	X	Ab	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	net53	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net49	net53	VGND	VNB	nfet_01v8	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Ab	net49	VGND	VNB	nfet_01v8	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.spice b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.spice
index fef3386..907b972 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.spice
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__clkdlybuf4s50_1 A VGND VNB VPB VPWR X
-M1000 a_282_52# a_27_52# VPWR VPB phighvt w=1e+06u l=500000u
-+  ad=2.65e+11p pd=2.53e+06u as=8.5e+11p ps=6.48e+06u
-M1001 X a_394_52# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1002 VPWR a_282_52# a_394_52# VPB phighvt w=1e+06u l=500000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1003 a_282_52# a_27_52# VGND VNB nshort w=1e+06u l=500000u
-+  ad=2.65e+11p pd=2.53e+06u as=5.924e+11p ps=5.44e+06u
-M1004 VGND A a_27_52# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 X a_394_52# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 VGND a_282_52# a_394_52# VNB nshort w=1e+06u l=500000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1007 VPWR A a_27_52# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 VPWR a_27_52# a_282_52# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=500000u
+X1 a_394_52# a_282_52# VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=500000u
+X2 a_27_52# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_27_52# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_394_52# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR a_394_52# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_394_52# a_282_52# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=500000u
+X7 VGND a_27_52# a_282_52# VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=500000u
 .ends
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.cdl b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.cdl
index 03bdb7d..1d3bb82 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.cdl
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__clkdlybuf4s50_2 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP1 X Ab VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 net53 A VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net49 net53 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
+MI12 Ab net49 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
+MI7 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 net53 A VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 net53 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
-MI10 net49 net53 VPB phighvt m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
+MI9 net49 net53 VNB nfet_01v8 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
-MI12 Ab net49 VPB phighvt 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
-MI7 X Ab VNB nshort 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
-MMIN0 net53 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 net49 net53 VNB nshort 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
-MI11 Ab net49 VNB nshort m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
+MI11 Ab net49 VNB nfet_01v8 m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__clkdlybuf4s50_2
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.netlist.tsv b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.netlist.tsv
index 1e62073..363ccf7 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.netlist.tsv
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__clkdlybuf4s50_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
-MMIP1	MOSFET	X	Ab	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	net53	A	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net49	net53	VPWR	VPB	phighvt	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Ab	net49	VPWR	VPB	phighvt	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	X	Ab	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	net53	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net49	net53	VGND	VNB	nshort	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Ab	net49	VGND	VNB	nshort	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	net53	A	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net49	net53	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Ab	net49	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	X	Ab	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	net53	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net49	net53	VGND	VNB	nfet_01v8	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Ab	net49	VGND	VNB	nfet_01v8	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.spice b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.spice
index df669eb..ec9a82e 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.spice
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__clkdlybuf4s50_2 A VGND VNB VPB VPWR X
-M1000 a_282_52# a_27_52# VPWR VPB phighvt w=1e+06u l=500000u
-+  ad=2.65e+11p pd=2.53e+06u as=1.3666e+12p ps=9.82e+06u
-M1001 VGND a_394_52# X VNB nshort w=420000u l=150000u
-+  ad=7.646e+11p pd=7.1e+06u as=1.176e+11p ps=1.4e+06u
-M1002 X a_394_52# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1003 VPWR a_282_52# a_394_52# VPB phighvt w=1e+06u l=500000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1004 a_282_52# a_27_52# VGND VNB nshort w=1e+06u l=500000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1005 VGND A a_27_52# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 X a_394_52# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_394_52# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_282_52# a_394_52# VNB nshort w=1e+06u l=500000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1009 VPWR A a_27_52# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 VPWR a_27_52# a_282_52# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=500000u
+X1 a_394_52# a_282_52# VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=500000u
+X2 a_27_52# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_27_52# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_394_52# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_394_52# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_394_52# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_394_52# a_282_52# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=500000u
+X8 X a_394_52# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VGND a_27_52# a_282_52# VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=500000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_0.cdl b/cells/clkinv/sky130_fd_sc_lp__clkinv_0.cdl
index f6edfe6..e470ac8 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_0.cdl
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_0.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__clkinv_0 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP0 Y A VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A 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
-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
 .ENDS sky130_fd_sc_lp__clkinv_0
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_0.netlist.tsv b/cells/clkinv/sky130_fd_sc_lp__clkinv_0.netlist.tsv
index 45f2185..b96d94b 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_0.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_0.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__clkinv_0	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
-MMIP0	MOSFET	Y	A	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-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	pfet_01v8_hvt	1	0.64	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
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_0.spice b/cells/clkinv/sky130_fd_sc_lp__clkinv_0.spice
index cb022ec..9d9e57d 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_0.spice
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_0.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_lp__clkinv_0 A VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.113e+11p ps=1.37e+06u
-M1001 Y A VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=1.696e+11p ps=1.81e+06u
+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=640000u l=150000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_1.cdl b/cells/clkinv/sky130_fd_sc_lp__clkinv_1.cdl
index 2782c95..9aeb5be 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_1.cdl
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_1.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__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_lp__clkinv_1
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_1.netlist.tsv b/cells/clkinv/sky130_fd_sc_lp__clkinv_1.netlist.tsv
index 2cfc27c..e181f85 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_1.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_1.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__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_lp__clkinv_1.spice b/cells/clkinv/sky130_fd_sc_lp__clkinv_1.spice
index 0ac611d..d263188 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_1.spice
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_1.spice
@@ -16,10 +16,7 @@
 
 
 .subckt sky130_fd_sc_lp__clkinv_1 A VGND VNB VPB VPWR Y
-M1000 VPWR A Y VPB phighvt w=840000u l=150000u
-+  ad=4.452e+11p pd=4.42e+06u as=2.352e+11p ps=2.24e+06u
-M1001 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.113e+11p ps=1.37e+06u
-M1002 Y A VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_16.cdl b/cells/clkinv/sky130_fd_sc_lp__clkinv_16.cdl
index d8f4fca..877a0f3 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_16.cdl
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_16.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__clkinv_16
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_16.netlist.tsv b/cells/clkinv/sky130_fd_sc_lp__clkinv_16.netlist.tsv
index 1e654de..884ff5a 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_16.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_16.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_16.spice b/cells/clkinv/sky130_fd_sc_lp__clkinv_16.spice
index c71f6a6..d4d52c0 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_16.spice
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_16.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__clkinv_16 A VGND VNB VPB VPWR Y
-M1000 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.2336e+12p pd=3.696e+07u as=4.5738e+12p ps=4.002e+07u
-M1001 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=1.0458e+12p pd=1.254e+07u as=9.408e+11p ps=1.12e+07u
-M1007 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A VGND VNB nshort w=420000u 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.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A VPWR VPB phighvt w=1.26e+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 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR A Y VPB phighvt w=1.26e+06u 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 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VGND 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 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u 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.26e+06u l=150000u
+X22 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X32 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X33 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X36 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X37 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X38 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X39 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_2.cdl b/cells/clkinv/sky130_fd_sc_lp__clkinv_2.cdl
index ecef3bf..b487e35 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_2.cdl
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_2.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A VPB pfet_01v8_hvt m=3 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__clkinv_2
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_2.netlist.tsv b/cells/clkinv/sky130_fd_sc_lp__clkinv_2.netlist.tsv
index f87f63d..6180063 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_2.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_2.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_2.spice b/cells/clkinv/sky130_fd_sc_lp__clkinv_2.spice
index 7ee7dff..62e5f49 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_2.spice
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_2.spice
@@ -16,14 +16,9 @@
 
 
 .subckt sky130_fd_sc_lp__clkinv_2 A VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.226e+11p ps=2.74e+06u
-M1001 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.867e+11p pd=6.13e+06u as=6.867e+11p ps=6.13e+06u
-M1002 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_4.cdl b/cells/clkinv/sky130_fd_sc_lp__clkinv_4.cdl
index 4aa1f3a..72cee52 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_4.cdl
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_4.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A VPB pfet_01v8_hvt m=6 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__clkinv_4
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_4.netlist.tsv b/cells/clkinv/sky130_fd_sc_lp__clkinv_4.netlist.tsv
index e409eb0..c27e145 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_4.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_4.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_4.spice b/cells/clkinv/sky130_fd_sc_lp__clkinv_4.spice
index 1b471c2..294f271 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_4.spice
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_4.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__clkinv_4 A VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=3.402e+11p ps=4.14e+06u
-M1001 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.3797e+12p pd=1.227e+07u as=1.0584e+12p ps=9.24e+06u
-M1002 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VPWR VPB phighvt w=1.26e+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 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u 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.26e+06u l=150000u
+X3 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_8.cdl b/cells/clkinv/sky130_fd_sc_lp__clkinv_8.cdl
index 25646da..1bd9a70 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_8.cdl
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_8.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__clkinv_8
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_8.netlist.tsv b/cells/clkinv/sky130_fd_sc_lp__clkinv_8.netlist.tsv
index 7d36b10..b85535d 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_8.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_8.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_8.spice b/cells/clkinv/sky130_fd_sc_lp__clkinv_8.spice
index a1caebb..d051a66 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_8.spice
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_8.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__clkinv_8 A VGND VNB VPB VPWR Y
-M1000 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.1168e+12p pd=1.848e+07u as=2.4318e+12p ps=2.15e+07u
-M1001 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=5.754e+11p pd=6.94e+06u as=4.704e+11p ps=5.6e+06u
-M1002 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A Y VPB phighvt w=1.26e+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
-M1010 Y A VPWR VPB phighvt w=1.26e+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 VPWR VPB phighvt w=1.26e+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 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y A VPWR VPB phighvt w=1.26e+06u 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 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+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.26e+06u l=150000u
+X13 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.cdl b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.cdl
index 9c9240d..2706d31 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.cdl
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__clkinv_lp A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP0 Y A VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A 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
-MI6 net17 A VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net17 A 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
+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
-MMIN0 Y 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
-MI5 net25 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI5 net25 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__clkinv_lp
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.netlist.tsv b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.netlist.tsv
index fc34971..3cff94b 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__clkinv_lp	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
-MMIP0	MOSFET	Y	A	net17	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net17	A	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	Y	A	net25	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net25	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	net17	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net17	A	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Y	A	net25	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net25	A	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/clkinv/sky130_fd_sc_lp__clkinv_lp.spice b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.spice
index fd44fdc..b183142 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.spice
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__clkinv_lp A VGND VNB VPB VPWR Y
-M1000 a_124_92# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1001 a_124_468# A VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.824e+11p ps=1.85e+06u
-M1002 Y A a_124_92# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1003 Y A a_124_468# VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
+X0 a_124_92# A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND A a_124_92# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR A a_124_468# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_124_468# A Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.cdl b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.cdl
index 290d2de..eb67100 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.cdl
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.cdl
@@ -16,10 +16,10 @@
 
 .SUBCKT sky130_fd_sc_lp__clkinv_lp2 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MI6 Y A 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
-MMIN0 Y A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 Y A 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
-MI5 net22 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
+MI5 net22 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__clkinv_lp2
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.netlist.tsv b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.netlist.tsv
index 559d883..2242346 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.netlist.tsv
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.netlist.tsv
@@ -1,5 +1,5 @@
 sky130_fd_sc_lp__clkinv_lp2	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
-MI6	MOSFET	Y	A	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	Y	A	net22	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net22	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	Y	A	net22	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net22	A	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/clkinv/sky130_fd_sc_lp__clkinv_lp2.spice b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.spice
index b97862e..d498a21 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.spice
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.spice
@@ -16,10 +16,7 @@
 
 
 .subckt sky130_fd_sc_lp__clkinv_lp2 A VGND VNB VPB VPWR Y
-M1000 a_124_67# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1001 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=2.85e+11p ps=2.57e+06u
-M1002 Y A a_124_67# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
+X0 a_124_67# A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND A a_124_67# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.cdl b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.cdl
index 3438047..525b3a8 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.cdl
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.cdl
@@ -16,10 +16,10 @@
 
 .SUBCKT sky130_fd_sc_lp__clkinvlp_16 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MI9 Y A VPB phighvt m=16 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
-MI11 Y A VNB nshort m=10 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 Y A VPB pfet_01v8_hvt m=16 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
-MI10 net27 A VNB nshort m=10 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI11 Y A VNB nfet_01v8 m=10 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net27 A VNB nfet_01v8 m=10 w=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_lp__clkinvlp_16
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.netlist.tsv b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.netlist.tsv
index 66e07db..2934233 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.netlist.tsv
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.netlist.tsv
@@ -1,5 +1,5 @@
 sky130_fd_sc_lp__clkinvlp_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
-MI9	MOSFET	Y	A	VPWR	VPB	phighvt	16	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Y	A	net27	VNB	nshort	10	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net27	A	VGND	VNB	nshort	10	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	16	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Y	A	net27	VNB	nfet_01v8	10	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net27	A	VGND	VNB	nfet_01v8	10	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.spice b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.spice
index 3f3eefb..82e13ee 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.spice
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_lp__clkinvlp_16 A VGND VNB VPB VPWR Y
-M1000 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.24e+12p pd=2.048e+07u as=2.49e+12p ps=2.298e+07u
-M1001 a_268_67# A Y VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=7.7e+11p ps=8.3e+06u
-M1002 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_426_67# A VGND VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=9.075e+11p ps=9.9e+06u
-M1005 Y A a_426_67# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A a_1058_67# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.52e+06u
-M1007 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_1532_67# A Y VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=0p ps=0u
-M1009 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1058_67# A VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1216_67# A Y VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=0p ps=0u
-M1014 Y A a_110_67# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.52e+06u
-M1015 VGND A a_1216_67# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_584_67# A Y VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=0p ps=0u
-M1019 VGND A a_584_67# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A a_742_67# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.52e+06u
-M1021 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_110_67# A VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A a_268_67# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1374_67# A VGND VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=0p ps=0u
-M1027 a_742_67# A VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y A a_1374_67# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A a_1532_67# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_900_67# A Y VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=0p ps=0u
-M1033 VGND A a_900_67# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 VGND A a_426_67# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X3 VGND A a_1058_67# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X4 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 Y A a_1216_67# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X6 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_900_67# A VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X8 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_268_67# A VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X10 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 a_584_67# A VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X13 VGND A a_742_67# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X14 a_1058_67# A Y VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X15 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X16 a_742_67# A Y VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X17 a_1374_67# A Y VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X18 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X19 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X20 Y A a_900_67# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X21 Y A a_1532_67# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X22 a_110_67# A Y VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X23 a_1532_67# A VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X24 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X25 VGND A a_110_67# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X26 a_426_67# A Y VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X27 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X28 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X29 Y A a_584_67# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X30 a_1216_67# A VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X31 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X32 VGND A a_1374_67# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X33 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X34 Y A a_268_67# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X35 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.cdl b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.cdl
index 49f9f4d..be9a626 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.cdl
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.cdl
@@ -16,10 +16,10 @@
 
 .SUBCKT sky130_fd_sc_lp__clkinvlp_2 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MI9 Y A VPB phighvt m=2 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI11 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
-MI10 net27 A VNB nshort m=1 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 Y A VPB pfet_01v8_hvt m=2 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 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
+MI10 net27 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
 .ENDS sky130_fd_sc_lp__clkinvlp_2
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.netlist.tsv b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.netlist.tsv
index 169e8a3..a8733fc 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.netlist.tsv
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.netlist.tsv
@@ -1,5 +1,5 @@
 sky130_fd_sc_lp__clkinvlp_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
-MI9	MOSFET	Y	A	VPWR	VPB	phighvt	2	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Y	A	net27	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net27	A	VGND	VNB	nshort	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	2	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Y	A	net27	VNB	nfet_01v8	1	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net27	A	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/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.spice b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.spice
index 69f29b3..5841bba 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.spice
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__clkinvlp_2 A VGND VNB VPB VPWR Y
-M1000 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.8e+11p pd=2.56e+06u as=5.3e+11p ps=5.06e+06u
-M1001 a_185_67# A VGND VNB nshort w=550000u l=150000u
-+  ad=1.32e+11p pd=1.58e+06u as=1.5675e+11p ps=1.67e+06u
-M1002 Y A a_185_67# VNB nshort w=550000u l=150000u
-+  ad=1.5675e+11p pd=1.67e+06u as=0p ps=0u
-M1003 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_185_67# A Y VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X2 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 VGND A a_185_67# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
 .ends
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.cdl b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.cdl
index 94a1418..d7a9c51 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.cdl
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.cdl
@@ -16,10 +16,10 @@
 
 .SUBCKT sky130_fd_sc_lp__clkinvlp_4 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MI9 Y A VPB phighvt m=4 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI11 Y A VNB nshort m=2 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI10 net27 A VNB nshort m=2 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 Y A VPB pfet_01v8_hvt m=4 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 Y A VNB nfet_01v8 m=2 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net27 A VNB nfet_01v8 m=2 w=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_lp__clkinvlp_4
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.netlist.tsv b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.netlist.tsv
index c9ee60a..236c761 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.netlist.tsv
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.netlist.tsv
@@ -1,5 +1,5 @@
 sky130_fd_sc_lp__clkinvlp_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
-MI9	MOSFET	Y	A	VPWR	VPB	phighvt	4	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Y	A	net27	VNB	nshort	2	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net27	A	VGND	VNB	nshort	2	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	4	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Y	A	net27	VNB	nfet_01v8	2	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net27	A	VGND	VNB	nfet_01v8	2	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.spice b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.spice
index 848162e..c0c2a41 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.spice
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__clkinvlp_4 A VGND VNB VPB VPWR Y
-M1000 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=5.6e+11p pd=5.12e+06u as=8.1e+11p ps=7.62e+06u
-M1001 a_268_67# A Y VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=1.54e+11p ps=1.66e+06u
-M1002 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A a_110_67# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.52e+06u
-M1004 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_110_67# A VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=2.915e+11p ps=3.26e+06u
-M1007 VGND A a_268_67# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_268_67# A VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X2 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_110_67# A Y VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X4 VGND A a_110_67# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X5 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 Y A a_268_67# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X7 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.cdl b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.cdl
index 99e958b..a12be36 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.cdl
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.cdl
@@ -16,10 +16,10 @@
 
 .SUBCKT sky130_fd_sc_lp__clkinvlp_8 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MI9 Y A VPB phighvt m=8 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
-MI11 Y A VNB nshort m=4 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI10 net27 A VNB nshort m=4 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 Y A VPB pfet_01v8_hvt m=8 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
+MI11 Y A VNB nfet_01v8 m=4 w=0.55 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net27 A VNB nfet_01v8 m=4 w=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_lp__clkinvlp_8
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.netlist.tsv b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.netlist.tsv
index 008cdd7..9cc52e4 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.netlist.tsv
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.netlist.tsv
@@ -1,5 +1,5 @@
 sky130_fd_sc_lp__clkinvlp_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
-MI9	MOSFET	Y	A	VPWR	VPB	phighvt	8	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Y	A	net27	VNB	nshort	4	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net27	A	VGND	VNB	nshort	4	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	8	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Y	A	net27	VNB	nfet_01v8	4	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net27	A	VGND	VNB	nfet_01v8	4	0.55	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.spice b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.spice
index d75b205..8812cb8 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.spice
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__clkinvlp_8 A VGND VNB VPB VPWR Y
-M1000 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=1.12e+12p pd=1.024e+07u as=1.37e+12p ps=1.274e+07u
-M1001 a_268_67# A Y VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=3.08e+11p ps=3.32e+06u
-M1002 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_426_67# A VGND VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=4.455e+11p ps=4.92e+06u
-M1004 Y A a_426_67# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A a_110_67# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.52e+06u
-M1008 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_584_67# A Y VNB nshort w=550000u l=150000u
-+  ad=1.155e+11p pd=1.52e+06u as=0p ps=0u
-M1010 VGND A a_584_67# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_110_67# A VGND VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A a_268_67# VNB nshort w=550000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A a_426_67# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_268_67# A VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X3 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_584_67# A VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X5 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_110_67# A Y VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X8 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 VGND A a_110_67# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X10 a_426_67# A Y VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X11 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 Y A a_584_67# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X13 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X14 Y A a_268_67# VNB sky130_fd_pr__nfet_01v8 w=550000u l=150000u
+X15 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/conb/sky130_fd_sc_lp__conb_0.cdl b/cells/conb/sky130_fd_sc_lp__conb_0.cdl
index f3d5b01..de50ddb 100644
--- a/cells/conb/sky130_fd_sc_lp__conb_0.cdl
+++ b/cells/conb/sky130_fd_sc_lp__conb_0.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__conb_0 VGND VNB VPB VPWR HI LO
 *.PININFO VGND:I VNB:I VPB:I VPWR:I HI:O LO:O
-MMIN1 LO LO VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 LO LO VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 LO HI VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 LO HI VNB nfet_01v8 m=1 w=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 HI HI 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
-MMIP1 HI LO 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
+MMIP0 HI HI 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
+MMIP1 HI LO 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_lp__conb_0
diff --git a/cells/conb/sky130_fd_sc_lp__conb_0.netlist.tsv b/cells/conb/sky130_fd_sc_lp__conb_0.netlist.tsv
index cf19543..44513d7 100644
--- a/cells/conb/sky130_fd_sc_lp__conb_0.netlist.tsv
+++ b/cells/conb/sky130_fd_sc_lp__conb_0.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__conb_0	VGND:I VNB:I VPB:I VPWR:I HI:O LO:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	LO	LO	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	LO	HI	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	HI	HI	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	HI	LO	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	LO	LO	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	LO	HI	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	HI	HI	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	HI	LO	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/conb/sky130_fd_sc_lp__conb_0.spice b/cells/conb/sky130_fd_sc_lp__conb_0.spice
index 81e86d7..bdedc35 100644
--- a/cells/conb/sky130_fd_sc_lp__conb_0.spice
+++ b/cells/conb/sky130_fd_sc_lp__conb_0.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__conb_0 VGND VNB VPB VPWR HI LO
-M1000 VPWR LO HI VPB phighvt w=640000u l=150000u
-+  ad=3.392e+11p pd=3.62e+06u as=1.792e+11p ps=1.84e+06u
-M1001 LO HI VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.226e+11p ps=2.74e+06u
-M1002 HI HI VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND LO LO VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 HI LO VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 VGND HI LO VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR HI HI VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 LO LO VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/conb/sky130_fd_sc_lp__conb_1.cdl b/cells/conb/sky130_fd_sc_lp__conb_1.cdl
index 75aabaf..14cc6b4 100644
--- a/cells/conb/sky130_fd_sc_lp__conb_1.cdl
+++ b/cells/conb/sky130_fd_sc_lp__conb_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__conb_1 VGND VNB VPB VPWR HI LO
 *.PININFO VGND:I VNB:I VPB:I VPWR:I HI:O LO:O
-MMIN1 LO LO VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 LO LO VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 LO HI VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 LO HI VNB nfet_01v8 m=1 w=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 HI HI 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
-MMIP1 HI LO 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
+MMIP0 HI HI 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
+MMIP1 HI LO 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_lp__conb_1
diff --git a/cells/conb/sky130_fd_sc_lp__conb_1.netlist.tsv b/cells/conb/sky130_fd_sc_lp__conb_1.netlist.tsv
index 7169741..c6647a0 100644
--- a/cells/conb/sky130_fd_sc_lp__conb_1.netlist.tsv
+++ b/cells/conb/sky130_fd_sc_lp__conb_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__conb_1	VGND:I VNB:I VPB:I VPWR:I HI:O LO:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIN1	MOSFET	LO	LO	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	LO	HI	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	HI	HI	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	HI	LO	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	LO	LO	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	LO	HI	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	HI	HI	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	HI	LO	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/conb/sky130_fd_sc_lp__conb_1.spice b/cells/conb/sky130_fd_sc_lp__conb_1.spice
index 4038a35..aa06677 100644
--- a/cells/conb/sky130_fd_sc_lp__conb_1.spice
+++ b/cells/conb/sky130_fd_sc_lp__conb_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__conb_1 VGND VNB VPB VPWR HI LO
-M1000 VPWR LO HI VPB phighvt w=640000u l=150000u
-+  ad=3.392e+11p pd=3.62e+06u as=1.792e+11p ps=1.84e+06u
-M1001 LO HI VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.226e+11p ps=2.74e+06u
-M1002 HI HI VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND LO LO VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 HI LO VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 VGND HI LO VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR HI HI VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 LO LO VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/decap/sky130_fd_sc_lp__decap_12.cdl b/cells/decap/sky130_fd_sc_lp__decap_12.cdl
index 86c2398..9fc1bf9 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_12.cdl
+++ b/cells/decap/sky130_fd_sc_lp__decap_12.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__decap_12 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI1 VGND VPWR VNB nshort m=1 w=1.0 l=4.0 mult=1 sa=0.265 sb=0.265
+MI1 VGND VPWR VNB nfet_01v8 m=1 w=1.0 l=4.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=4.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=4.0 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__decap_12
diff --git a/cells/decap/sky130_fd_sc_lp__decap_12.netlist.tsv b/cells/decap/sky130_fd_sc_lp__decap_12.netlist.tsv
index b291a57..6a1c5a4 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_12.netlist.tsv
+++ b/cells/decap/sky130_fd_sc_lp__decap_12.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__decap_12	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	1.0	4.0	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	VPWR	VGND	VPWR	VPB	phighvt	1	1.0	4.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	VGND	VPWR	VGND	VNB	nfet_01v8	1	1.0	4.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	4.0	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decap/sky130_fd_sc_lp__decap_12.spice b/cells/decap/sky130_fd_sc_lp__decap_12.spice
index ef4eb61..b22e3cf 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_12.spice
+++ b/cells/decap/sky130_fd_sc_lp__decap_12.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_lp__decap_12 VGND VNB VPB VPWR
-M1000 VGND VPWR VGND VNB nshort w=1e+06u l=4e+06u
-+  ad=5.5e+11p pd=5.1e+06u as=0p ps=0u
-M1001 VPWR VGND VPWR VPB phighvt w=1e+06u l=4e+06u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
+X0 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=4e+06u
+X1 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=4e+06u
 .ends
diff --git a/cells/decap/sky130_fd_sc_lp__decap_3.cdl b/cells/decap/sky130_fd_sc_lp__decap_3.cdl
index be55458..9bca306 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_3.cdl
+++ b/cells/decap/sky130_fd_sc_lp__decap_3.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__decap_3 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI1 VGND VPWR VNB nshort m=1 w=0.55 l=0.5 mult=1 sa=0.265 sb=0.265
+MI1 VGND VPWR VNB nfet_01v8 m=1 w=0.55 l=0.5 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=0.5 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=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_lp__decap_3
diff --git a/cells/decap/sky130_fd_sc_lp__decap_3.netlist.tsv b/cells/decap/sky130_fd_sc_lp__decap_3.netlist.tsv
index dd0a15f..d8681da 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_3.netlist.tsv
+++ b/cells/decap/sky130_fd_sc_lp__decap_3.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__decap_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
-MI1	MOSFET	VGND	VPWR	VGND	VNB	nshort	1	0.55	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	VPWR	VGND	VPWR	VPB	phighvt	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	VGND	VPWR	VGND	VNB	nfet_01v8	1	0.55	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	VPWR	VGND	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decap/sky130_fd_sc_lp__decap_3.spice b/cells/decap/sky130_fd_sc_lp__decap_3.spice
index 22cdff6..f66380b 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_3.spice
+++ b/cells/decap/sky130_fd_sc_lp__decap_3.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_lp__decap_3 VGND VNB VPB VPWR
-M1000 VPWR VGND VPWR VPB phighvt w=1e+06u l=500000u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1001 VGND VPWR VGND VNB nshort w=550000u l=500000u
-+  ad=3.025e+11p pd=3.3e+06u as=0p ps=0u
+X0 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=500000u
+X1 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=500000u
 .ends
diff --git a/cells/decap/sky130_fd_sc_lp__decap_4.cdl b/cells/decap/sky130_fd_sc_lp__decap_4.cdl
index 2994c59..bc0ebe1 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_4.cdl
+++ b/cells/decap/sky130_fd_sc_lp__decap_4.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__decap_4 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI1 VGND VPWR VNB nshort m=1 w=1.0 l=1.0 mult=1 sa=0.265 sb=0.265
+MI1 VGND VPWR VNB nfet_01v8 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 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_lp__decap_4
diff --git a/cells/decap/sky130_fd_sc_lp__decap_4.netlist.tsv b/cells/decap/sky130_fd_sc_lp__decap_4.netlist.tsv
index 18603a8..000a608 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_4.netlist.tsv
+++ b/cells/decap/sky130_fd_sc_lp__decap_4.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__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	1.0	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	1.0	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_lp__decap_4.spice b/cells/decap/sky130_fd_sc_lp__decap_4.spice
index 8667e7d..6fc9ce4 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_4.spice
+++ b/cells/decap/sky130_fd_sc_lp__decap_4.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_lp__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=1e+06u l=1e+06u
-+  ad=5.5e+11p pd=5.1e+06u as=0p ps=0u
+X0 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=1e+06u
+X1 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=1e+06u
 .ends
diff --git a/cells/decap/sky130_fd_sc_lp__decap_6.cdl b/cells/decap/sky130_fd_sc_lp__decap_6.cdl
index eea6843..1f1d74b 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_6.cdl
+++ b/cells/decap/sky130_fd_sc_lp__decap_6.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__decap_6 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI1 VGND VPWR VNB nshort m=1 w=1.0 l=2.0 mult=1 sa=0.265 sb=0.265
+MI1 VGND VPWR VNB nfet_01v8 m=1 w=1.0 l=2.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=2.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=2.0 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__decap_6
diff --git a/cells/decap/sky130_fd_sc_lp__decap_6.netlist.tsv b/cells/decap/sky130_fd_sc_lp__decap_6.netlist.tsv
index 3e02513..dc9ad51 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_6.netlist.tsv
+++ b/cells/decap/sky130_fd_sc_lp__decap_6.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__decap_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	1.0	2.0	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	VPWR	VGND	VPWR	VPB	phighvt	1	1.0	2.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	VGND	VPWR	VGND	VNB	nfet_01v8	1	1.0	2.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	2.0	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decap/sky130_fd_sc_lp__decap_6.spice b/cells/decap/sky130_fd_sc_lp__decap_6.spice
index 2e2c261..af8407b 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_6.spice
+++ b/cells/decap/sky130_fd_sc_lp__decap_6.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_lp__decap_6 VGND VNB VPB VPWR
-M1000 VPWR VGND VPWR VPB phighvt w=1e+06u l=2e+06u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1001 VGND VPWR VGND VNB nshort w=1e+06u l=2e+06u
-+  ad=5.3e+11p pd=5.06e+06u as=0p ps=0u
+X0 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=2e+06u
+X1 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=2e+06u
 .ends
diff --git a/cells/decap/sky130_fd_sc_lp__decap_8.cdl b/cells/decap/sky130_fd_sc_lp__decap_8.cdl
index 66ec9e6..280d8e4 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_8.cdl
+++ b/cells/decap/sky130_fd_sc_lp__decap_8.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__decap_8 VGND VNB VPB VPWR
 *.PININFO VGND:I VNB:I VPB:I VPWR:I
-MI1 VGND VPWR VNB nshort m=1 w=1.0 l=2.0 mult=1 sa=0.265 sb=0.265
+MI1 VGND VPWR VNB nfet_01v8 m=1 w=1.0 l=2.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=2.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=2.0 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__decap_8
diff --git a/cells/decap/sky130_fd_sc_lp__decap_8.netlist.tsv b/cells/decap/sky130_fd_sc_lp__decap_8.netlist.tsv
index c06f4f7..2fc29d0 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_8.netlist.tsv
+++ b/cells/decap/sky130_fd_sc_lp__decap_8.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__decap_8	VGND:I VNB:I VPB:I VPWR:I
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI1	MOSFET	VGND	VPWR	VGND	VNB	nshort	1	1.0	2.0	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	VPWR	VGND	VPWR	VPB	phighvt	1	1.0	2.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	VGND	VPWR	VGND	VNB	nfet_01v8	1	1.0	2.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	2.0	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decap/sky130_fd_sc_lp__decap_8.spice b/cells/decap/sky130_fd_sc_lp__decap_8.spice
index bd70abb..e6ab5ba 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_8.spice
+++ b/cells/decap/sky130_fd_sc_lp__decap_8.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_lp__decap_8 VGND VNB VPB VPWR
-M1000 VGND VPWR VGND VNB nshort w=1e+06u l=2e+06u
-+  ad=5.5e+11p pd=5.1e+06u as=0p ps=0u
-M1001 VPWR VGND VPWR VPB phighvt w=1e+06u l=2e+06u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
+X0 VPWR VGND VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=2e+06u
+X1 VGND VPWR VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=2e+06u
 .ends
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.cdl b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.cdl
index 4ca6df0..aa52f56 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.cdl
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__decapkapwr_12 KAPWR VGND VNB VPB VPWR
 *.PININFO KAPWR:I VGND:I VNB:I VPB:I VPWR:I
-MI2 KAPWR VGND VPB phighvt m=1 w=1.0 l=4.0 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 VGND KAPWR VNB nshort m=1 w=1.0 l=4.0 mult=1 sa=0.265 sb=0.265
+MI2 KAPWR VGND VPB pfet_01v8_hvt m=1 w=1.0 l=4.0 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI1 VGND KAPWR VNB nfet_01v8 m=1 w=1.0 l=4.0 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__decapkapwr_12
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.netlist.tsv b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.netlist.tsv
index c0ee1ca..107b6ef 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.netlist.tsv
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__decapkapwr_12	KAPWR:I 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	KAPWR	VGND	KAPWR	VPB	phighvt	1	1.0	4.0	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	VGND	KAPWR	VGND	VNB	nshort	1	1.0	4.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	KAPWR	VGND	KAPWR	VPB	pfet_01v8_hvt	1	1.0	4.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	VGND	KAPWR	VGND	VNB	nfet_01v8	1	1.0	4.0	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.spice b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.spice
index b747dc7..7bf4992 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.spice
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_lp__decapkapwr_12 KAPWR VGND VNB VPB VPWR
-M1000 VGND KAPWR VGND VNB nshort w=1e+06u l=4e+06u
-+  ad=5.5e+11p pd=5.1e+06u as=0p ps=0u
-M1001 KAPWR VGND KAPWR VPB phighvt w=1e+06u l=4e+06u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
+X0 KAPWR VGND KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=4e+06u
+X1 VGND KAPWR VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=4e+06u
 .ends
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.cdl b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.cdl
index ec2ca56..f99d520 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.cdl
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__decapkapwr_3 KAPWR VGND VNB VPB VPWR
 *.PININFO KAPWR:I VGND:I VNB:I VPB:I VPWR:I
-MI2 KAPWR VGND VPB phighvt 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
-MI1 VGND KAPWR VNB nshort m=1 w=0.55 l=0.5 mult=1 sa=0.265 sb=0.265
+MI2 KAPWR VGND 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
+MI1 VGND KAPWR VNB nfet_01v8 m=1 w=0.55 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_lp__decapkapwr_3
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.netlist.tsv b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.netlist.tsv
index 7bf23de..bdb05b6 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.netlist.tsv
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__decapkapwr_3	KAPWR:I 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	KAPWR	VGND	KAPWR	VPB	phighvt	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	VGND	KAPWR	VGND	VNB	nshort	1	0.55	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	KAPWR	VGND	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	VGND	KAPWR	VGND	VNB	nfet_01v8	1	0.55	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.spice b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.spice
index cfbe443..093d86c 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.spice
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_lp__decapkapwr_3 KAPWR VGND VNB VPB VPWR
-M1000 KAPWR VGND KAPWR VPB phighvt w=1e+06u l=500000u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1001 VGND KAPWR VGND VNB nshort w=550000u l=500000u
-+  ad=3.025e+11p pd=3.3e+06u as=0p ps=0u
+X0 VGND KAPWR VGND VNB sky130_fd_pr__nfet_01v8 w=550000u l=500000u
+X1 KAPWR VGND KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=500000u
 .ends
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.cdl b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.cdl
index d55eecb..1013da2 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.cdl
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__decapkapwr_4 KAPWR VGND VNB VPB VPWR
 *.PININFO KAPWR:I VGND:I VNB:I VPB:I VPWR:I
-MI2 KAPWR 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
-MI1 VGND KAPWR VNB nshort m=1 w=1.0 l=1.0 mult=1 sa=0.265 sb=0.265
+MI2 KAPWR 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
+MI1 VGND KAPWR VNB nfet_01v8 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_lp__decapkapwr_4
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.netlist.tsv b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.netlist.tsv
index b6c2ce9..b9cd84d 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.netlist.tsv
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__decapkapwr_4	KAPWR:I 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	KAPWR	VGND	KAPWR	VPB	phighvt	1	1.0	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	VGND	KAPWR	VGND	VNB	nshort	1	1.0	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	KAPWR	VGND	KAPWR	VPB	pfet_01v8_hvt	1	1.0	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	VGND	KAPWR	VGND	VNB	nfet_01v8	1	1.0	1.0	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.spice b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.spice
index 5ce07ce..65a07e5 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.spice
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_lp__decapkapwr_4 KAPWR VGND VNB VPB VPWR
-M1000 KAPWR VGND KAPWR VPB phighvt w=1e+06u l=1e+06u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1001 VGND KAPWR VGND VNB nshort w=1e+06u l=1e+06u
-+  ad=5.5e+11p pd=5.1e+06u as=0p ps=0u
+X0 VGND KAPWR VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=1e+06u
+X1 KAPWR VGND KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=1e+06u
 .ends
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.cdl b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.cdl
index 524bc43..63488ff 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.cdl
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__decapkapwr_6 KAPWR VGND VNB VPB VPWR
 *.PININFO KAPWR:I VGND:I VNB:I VPB:I VPWR:I
-MI1 VGND KAPWR VNB nshort m=1 w=1.0 l=2.0 mult=1 sa=0.265 sb=0.265
+MI1 VGND KAPWR VNB nfet_01v8 m=1 w=1.0 l=2.0 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 KAPWR VGND VPB phighvt m=1 w=1.0 l=2.0 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI2 KAPWR VGND VPB pfet_01v8_hvt m=1 w=1.0 l=2.0 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__decapkapwr_6
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.netlist.tsv b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.netlist.tsv
index d46dcc0..6434c8c 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.netlist.tsv
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__decapkapwr_6	KAPWR:I 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	KAPWR	VGND	VNB	nshort	1	1.0	2.0	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	KAPWR	VGND	KAPWR	VPB	phighvt	1	1.0	2.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	VGND	KAPWR	VGND	VNB	nfet_01v8	1	1.0	2.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	KAPWR	VGND	KAPWR	VPB	pfet_01v8_hvt	1	1.0	2.0	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.spice b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.spice
index c4bb597..97464f4 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.spice
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_lp__decapkapwr_6 KAPWR VGND VNB VPB VPWR
-M1000 KAPWR VGND KAPWR VPB phighvt w=1e+06u l=2e+06u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
-M1001 VGND KAPWR VGND VNB nshort w=1e+06u l=2e+06u
-+  ad=5.3e+11p pd=5.06e+06u as=0p ps=0u
+X0 VGND KAPWR VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=2e+06u
+X1 KAPWR VGND KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=2e+06u
 .ends
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.cdl b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.cdl
index 439f18e..b7256f7 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.cdl
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__decapkapwr_8 KAPWR VGND VNB VPB VPWR
 *.PININFO KAPWR:I VGND:I VNB:I VPB:I VPWR:I
-MI2 KAPWR VGND VPB phighvt m=1 w=1.0 l=2.0 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI1 VGND KAPWR VNB nshort m=1 w=1.0 l=2.0 mult=1 sa=0.265 sb=0.265
+MI2 KAPWR VGND VPB pfet_01v8_hvt m=1 w=1.0 l=2.0 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI1 VGND KAPWR VNB nfet_01v8 m=1 w=1.0 l=2.0 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__decapkapwr_8
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.netlist.tsv b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.netlist.tsv
index 72a6aa7..1d78b8a 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.netlist.tsv
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__decapkapwr_8	KAPWR:I 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	KAPWR	VGND	KAPWR	VPB	phighvt	1	1.0	2.0	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	VGND	KAPWR	VGND	VNB	nshort	1	1.0	2.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	KAPWR	VGND	KAPWR	VPB	pfet_01v8_hvt	1	1.0	2.0	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	VGND	KAPWR	VGND	VNB	nfet_01v8	1	1.0	2.0	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.spice b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.spice
index bfd3c97..a412880 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.spice
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_lp__decapkapwr_8 KAPWR VGND VNB VPB VPWR
-M1000 VGND KAPWR VGND VNB nshort w=1e+06u l=2e+06u
-+  ad=5.5e+11p pd=5.1e+06u as=0p ps=0u
-M1001 KAPWR VGND KAPWR VPB phighvt w=1e+06u l=2e+06u
-+  ad=5.6e+11p pd=5.12e+06u as=0p ps=0u
+X0 KAPWR VGND KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=2e+06u
+X1 VGND KAPWR VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=2e+06u
 .ends
diff --git a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.cdl b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.cdl
index f9d0a47..8e48043 100644
--- a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.cdl
+++ b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265
+MI46 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI676 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI675 net141 SET_B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI675 net141 SET_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
-MI653 Q net162 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI677 M1 RESET VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M0 clkpos VNB nshort m=1 w=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.42 l=0.15 mult=1 sa=0.265
+MI653 Q net162 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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
+MI677 M1 RESET VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N net82 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-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.64 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.64 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.64 l=0.15 mult=1 sa=0.265
+MI44 clkpos CLK_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI3 net82 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
-MI7 net81 SET_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
-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.26 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=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 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 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
-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=0.84 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
-MI11 net221 RESET VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI651 Q_N net82 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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
+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
-MI47 clkneg clkpos VPB phighvt m=1 w=0.64 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
-MI45 clkpos CLK_N VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI668 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
-MI680 M1 M0 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI667 net93 M1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI630 net82 RESET VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI3 net82 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
-MI663 net162 net82 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI7 net81 SET_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
-MI661 Q_N net82 VPB phighvt m=1 w=1.26 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.26 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=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 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=0.84 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=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 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=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 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 pfet_01v8_hvt m=1 w=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.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 net82 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dfbbn_1
diff --git a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.netlist.tsv b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.netlist.tsv
index e5f0934..79bad46 100644
--- a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.netlist.tsv
+++ b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_lp__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.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	net141	SET_B	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net162	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	M1	RESET	net141	VNB	nshort	1	0.64	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	clkpos	CLK_N	VGND	VNB	nshort	1	0.42	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.84	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI667	MOSFET	net93	M1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI630	MOSFET	net82	RESET	net81	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	net82	S0	net81	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net81	SET_B	VGND	VNB	nshort	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	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net82	S0	net221	VPB	phighvt	1	0.84	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	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net221	RESET	VPWR	VPB	phighvt	1	0.84	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	phighvt	1	0.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net82	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.42	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.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net162	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	M1	RESET	net141	VNB	nfet_01v8	1	0.64	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	clkpos	CLK_N	VGND	VNB	nfet_01v8	1	0.42	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.84	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI667	MOSFET	net93	M1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI630	MOSFET	net82	RESET	net81	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	net82	S0	net81	VNB	nfet_01v8	1	0.64	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.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	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net82	S0	net221	VPB	pfet_01v8_hvt	1	0.84	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	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net221	RESET	VPWR	VPB	pfet_01v8_hvt	1	0.84	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	0.64	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	0.64	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.spice b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.spice
index 89a2ffa..acfecb4 100644
--- a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.spice
+++ b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__dfbbn_1 CLK_N D RESET_B SET_B VGND VNB VPB VPWR Q Q_N
-M1000 VPWR a_1741_137# a_1649_512# VPB phighvt w=420000u l=150000u
-+  ad=2.95378e+12p pd=2.258e+07u as=2.709e+11p ps=2.13e+06u
-M1001 a_1741_137# a_1531_428# a_1896_119# VNB nshort w=640000u l=150000u
-+  ad=2.4475e+11p pd=2.35e+06u as=4.352e+11p ps=3.92e+06u
-M1002 VGND RESET_B a_1186_21# VNB nshort w=420000u l=150000u
-+  ad=1.9425e+12p pd=1.556e+07u as=1.197e+11p ps=1.41e+06u
-M1003 a_1228_379# a_546_449# a_755_398# VPB phighvt w=840000u l=150000u
-+  ad=2.016e+11p pd=2.16e+06u as=7.14e+11p ps=3.38e+06u
-M1004 a_1436_379# a_755_398# VPWR VPB phighvt w=840000u l=150000u
-+  ad=3.15875e+11p pd=2.82e+06u as=0p ps=0u
-M1005 a_1442_119# a_755_398# VGND VNB nshort w=640000u l=150000u
-+  ad=2.304e+11p pd=2e+06u as=0p ps=0u
-M1006 VGND a_1741_137# a_1693_163# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1007 VPWR RESET_B a_1186_21# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.76e+11p ps=1.83e+06u
-M1008 a_460_449# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1009 VGND a_113_67# a_223_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1010 VPWR a_755_398# a_707_449# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1011 Q_N a_1741_137# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.465e+11p pd=3.07e+06u as=0p ps=0u
-M1012 a_1013_66# a_1186_21# a_755_398# VNB nshort w=640000u l=150000u
-+  ad=3.648e+11p pd=3.7e+06u as=3.606e+11p ps=2.75e+06u
-M1013 VPWR a_1186_21# a_2036_451# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=2.1e+06u
-M1014 a_1896_119# a_1186_21# a_1741_137# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1741_137# SET_B VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1016 Q a_2511_137# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1017 a_755_398# a_546_449# a_1013_66# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1693_163# a_223_119# a_1531_428# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.643e+11p ps=2.47e+06u
-M1019 VPWR a_1741_137# a_2511_137# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.76e+11p ps=1.83e+06u
-M1020 VPWR a_1186_21# a_1228_379# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1531_428# a_223_119# a_1436_379# VPB phighvt w=840000u l=150000u
-+  ad=3.381e+11p pd=2.56e+06u as=0p ps=0u
-M1022 a_460_449# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1023 a_546_449# a_223_119# a_460_449# VNB nshort w=420000u l=150000u
-+  ad=2.2095e+11p pd=1.92e+06u as=0p ps=0u
-M1024 a_1013_66# SET_B VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1531_428# a_113_67# a_1442_119# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1896_119# SET_B VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_113_67# CLK_N VPWR VPB phighvt w=640000u l=150000u
-+  ad=2.336e+11p pd=2.01e+06u as=0p ps=0u
-M1028 a_2036_451# a_1531_428# a_1741_137# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_113_67# CLK_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1030 Q_N a_1741_137# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1031 VGND a_755_398# a_702_110# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=1.68e+06u
-M1032 VPWR a_113_67# a_223_119# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1033 a_707_449# a_223_119# a_546_449# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.751e+11p ps=2.15e+06u
-M1034 VGND a_1741_137# a_2511_137# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1035 Q a_2511_137# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1036 a_546_449# a_113_67# a_460_449# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_755_398# SET_B VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_702_110# a_113_67# a_546_449# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_1649_512# a_113_67# a_1531_428# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1013_66# a_546_449# a_755_398# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 a_1741_137# a_1531_428# a_2036_451# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 a_702_110# a_755_398# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND a_2511_137# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_1693_163# a_1741_137# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_1741_137# a_1186_21# a_1896_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 VPWR CLK_N a_113_67# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 a_707_449# a_755_398# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VGND a_1741_137# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VPWR SET_B a_1741_137# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 a_2511_137# a_1741_137# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 a_223_119# a_113_67# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 a_223_119# a_113_67# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_1442_119# a_113_67# a_1531_428# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X14 a_2511_137# a_1741_137# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_1649_512# a_1741_137# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 a_1228_379# a_1186_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X17 VPWR a_755_398# a_1436_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X18 VGND a_755_398# a_1442_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 a_1436_379# a_223_119# a_1531_428# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X20 a_1186_21# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X21 a_1896_119# a_1531_428# a_1741_137# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 a_2036_451# a_1186_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X23 a_1531_428# a_113_67# a_1649_512# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X24 VGND D a_460_449# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_546_449# a_223_119# a_707_449# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X26 VGND SET_B a_1013_66# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X27 a_460_449# a_113_67# a_546_449# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 VPWR SET_B a_755_398# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X29 a_755_398# a_1186_21# a_1013_66# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X30 VPWR D a_460_449# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X31 a_1186_21# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 VGND CLK_N a_113_67# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 VPWR a_1741_137# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X34 a_755_398# a_546_449# a_1228_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X35 a_460_449# a_223_119# a_546_449# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 VPWR a_2511_137# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X37 a_1531_428# a_223_119# a_1693_163# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 a_546_449# a_113_67# a_702_110# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 VGND SET_B a_1896_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.cdl b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.cdl
index 5726de9..e5a7921 100644
--- a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.cdl
+++ b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265
+MI46 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI676 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI675 net141 SET_B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI675 net141 SET_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
-MI653 Q net166 VNB nshort 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
-MI677 M1 RESET VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M0 clkpos VNB nshort m=1 w=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.42 l=0.15 mult=1 sa=0.265
+MI653 Q net166 VNB nfet_01v8 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 net122 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 net114 net90 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.64 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 net90 VNB nshort 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
-MI652 net166 net90 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.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI667 net101 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
-MI630 net90 RESET VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI44 clkpos CLK_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI3 net90 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
-MI7 net89 SET_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
-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 net166 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net90 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
-MI670 net222 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 net169 RESET VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI649 net122 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 net214 net90 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 net90 SET_B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI654 net114 net90 VNB nfet_01v8 m=1 w=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 net225 RESET VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI651 Q_N net90 VNB nfet_01v8 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
-MI650 net198 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
+MI652 net166 net90 VNB nfet_01v8 m=1 w=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.64 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
-MI45 clkpos CLK_N VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI668 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
-MI680 M1 M0 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI667 net101 M1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI630 net90 RESET VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI3 net90 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
-MI663 net166 net90 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI7 net89 SET_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
-MI661 Q_N net90 VPB phighvt m=2 w=1.26 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 net166 VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net90 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
+MI670 net222 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 net169 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 net214 net90 VPB pfet_01v8_hvt m=1 w=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 net90 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
+MI11 net225 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
+MI650 net198 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=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 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 pfet_01v8_hvt m=1 w=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 net166 net90 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 net90 VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dfbbn_2
diff --git a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.netlist.tsv b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.netlist.tsv
index 20a21ec..52b0682 100644
--- a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.netlist.tsv
+++ b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_lp__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.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	net141	SET_B	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net166	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	M1	RESET	net141	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M0	clkpos	net122	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	net122	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	net114	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net114	net90	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	net90	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net166	net90	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	net101	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI667	MOSFET	net101	M1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI630	MOSFET	net90	RESET	net89	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	net90	S0	net89	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net89	SET_B	VGND	VNB	nshort	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	net222	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net166	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net90	S0	net225	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net222	M1	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI678	MOSFET	net169	RESET	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net214	net90	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	S0	clkpos	net214	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net90	SET_B	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net225	RESET	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	net198	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	net198	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI680	MOSFET	M1	M0	net169	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net166	net90	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net90	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.42	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.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net166	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	M1	RESET	net141	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M0	clkpos	net122	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	net122	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	net114	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net114	net90	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	net90	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net166	net90	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	net101	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI667	MOSFET	net101	M1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI630	MOSFET	net90	RESET	net89	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	net90	S0	net89	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net89	SET_B	VGND	VNB	nfet_01v8	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	net222	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net166	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net90	S0	net225	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net222	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	net169	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	net214	net90	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	net214	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net90	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net225	RESET	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	net198	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	net198	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	0.64	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI680	MOSFET	M1	M0	net169	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net166	net90	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net90	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.spice b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.spice
index 00e99bf..47ec5e9 100644
--- a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.spice
+++ b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.spice
@@ -16,92 +16,48 @@
 
 
 .subckt sky130_fd_sc_lp__dfbbn_2 CLK_N D RESET_B SET_B VGND VNB VPB VPWR Q Q_N
-M1000 VGND a_1746_137# a_1698_163# VNB nshort w=420000u l=150000u
-+  ad=2.4516e+12p pd=2.023e+07u as=1.008e+11p ps=1.32e+06u
-M1001 VGND RESET_B a_1191_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1002 VGND a_113_57# a_223_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1003 a_1018_60# a_1191_21# a_789_78# VNB nshort w=640000u l=150000u
-+  ad=3.648e+11p pd=3.7e+06u as=3.69e+11p ps=2.81e+06u
-M1004 a_1746_137# a_1542_428# a_1911_119# VNB nshort w=640000u l=150000u
-+  ad=3.5555e+11p pd=2.67e+06u as=3.776e+11p ps=3.74e+06u
-M1005 a_1447_379# a_789_78# VPWR VPB phighvt w=840000u l=150000u
-+  ad=3.15875e+11p pd=2.82e+06u as=4.10265e+12p ps=2.971e+07u
-M1006 VPWR a_1746_137# a_2618_131# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1007 Q a_2618_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1008 Q_N a_1746_137# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1009 VPWR a_1191_21# a_2048_428# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=2.1e+06u
-M1010 a_789_78# a_549_449# a_1018_60# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_1746_137# Q_N VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1012 a_463_449# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1013 a_549_449# a_223_119# a_463_449# VNB nshort w=420000u l=150000u
-+  ad=2.2125e+11p pd=1.94e+06u as=0p ps=0u
-M1014 a_1746_137# SET_B VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1015 a_1698_163# a_223_119# a_1542_428# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.643e+11p ps=2.47e+06u
-M1016 a_1644_506# a_113_57# a_1542_428# VPB phighvt w=420000u l=150000u
-+  ad=2.919e+11p pd=2.23e+06u as=2.6985e+11p ps=2.4e+06u
-M1017 a_1018_60# SET_B VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Q a_2618_131# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1019 a_1542_428# a_113_57# a_1447_119# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.304e+11p ps=2e+06u
-M1020 a_1542_428# a_223_119# a_1447_379# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_1746_137# a_1644_506# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_2048_428# a_1542_428# a_1746_137# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_549_449# a_113_57# a_463_449# VPB phighvt w=420000u l=150000u
-+  ad=2.73e+11p pd=2.14e+06u as=1.176e+11p ps=1.4e+06u
-M1024 a_789_78# SET_B VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1025 a_113_57# CLK_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1026 VPWR RESET_B a_1191_21# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1027 VPWR a_2618_131# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND a_1746_137# Q_N VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Q_N a_1746_137# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_709_449# a_223_119# a_549_449# VPB phighvt w=420000u l=150000u
-+  ad=1.68e+11p pd=1.64e+06u as=0p ps=0u
-M1031 a_1911_119# SET_B VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND a_1746_137# a_2618_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1033 VGND a_2618_131# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_113_57# CLK_N VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1035 VPWR a_113_57# a_223_119# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1036 VPWR a_1191_21# a_1119_379# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=3.024e+11p ps=2.4e+06u
-M1037 VGND a_789_78# a_705_104# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=1.68e+06u
-M1038 a_1911_119# a_1191_21# a_1746_137# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_789_78# a_709_449# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_1119_379# a_549_449# a_789_78# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_705_104# a_113_57# a_549_449# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_463_449# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_1447_119# a_789_78# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1542_428# a_223_119# a_1698_163# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_1911_119# a_1542_428# a_1746_137# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 VPWR a_1746_137# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND CLK_N a_113_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_223_119# a_113_57# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_463_449# a_223_119# a_549_449# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_2618_131# a_1746_137# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 VPWR CLK_N a_113_57# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 a_1698_163# a_1746_137# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_789_78# a_1191_21# a_1018_60# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 VGND SET_B a_1911_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 Q_N a_1746_137# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VGND SET_B a_1018_60# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 a_223_119# a_113_57# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 VPWR a_789_78# a_1447_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X15 a_1447_379# a_223_119# a_1542_428# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 a_1447_119# a_113_57# a_1542_428# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 a_2048_428# a_1191_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X18 VPWR a_2618_131# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VPWR SET_B a_789_78# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X20 a_1644_506# a_1746_137# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 a_1119_379# a_1191_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X22 a_549_449# a_113_57# a_705_104# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VGND a_789_78# a_1447_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X24 VGND a_1746_137# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 a_1746_137# a_1542_428# a_2048_428# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X26 a_1018_60# a_549_449# a_789_78# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X27 a_1746_137# a_1191_21# a_1911_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X28 a_705_104# a_789_78# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_1191_21# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X30 a_549_449# a_223_119# a_709_449# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X31 a_709_449# a_789_78# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X32 Q a_2618_131# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X33 a_1191_21# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 VGND D a_463_449# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 VPWR SET_B a_1746_137# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X36 Q_N a_1746_137# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X37 VGND a_2618_131# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X38 a_463_449# a_113_57# a_549_449# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X39 a_2618_131# a_1746_137# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X40 VPWR D a_463_449# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X41 a_1542_428# a_113_57# a_1644_506# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X42 Q a_2618_131# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X43 a_789_78# a_549_449# a_1119_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
 .ends
diff --git a/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.cdl b/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.cdl
index 6edbed1..f9da8c9 100644
--- a/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.cdl
+++ b/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI676 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI675 net141 SET_B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI675 net141 SET_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
-MI653 Q net162 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI677 M1 RESET VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M0 clkpos VNB nshort m=1 w=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.42 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
+MI653 Q net162 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N net82 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-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.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
-MI668 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
-MI667 net93 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
-MI630 net82 RESET 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
-MI3 net82 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
-MI7 net81 SET_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
-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.26 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=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 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.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
+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
-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=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
-MI11 net221 RESET VPB phighvt m=1 w=0.84 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.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=0.64 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 clkneg CLK 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
-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.64 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
-MI661 Q_N net82 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MI668 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
+MI667 net93 M1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI630 net82 RESET VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI3 net82 S0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net81 SET_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
+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.26 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=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 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=0.84 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=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 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=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.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.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 net82 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dfbbp_1
diff --git a/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.netlist.tsv b/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.netlist.tsv
index 7245ac1..fdc6da6 100644
--- a/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.netlist.tsv
+++ b/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_lp__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.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	net141	SET_B	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net162	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	M1	RESET	net141	VNB	nshort	1	0.64	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	clkneg	CLK	VGND	VNB	nshort	1	0.42	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.84	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI667	MOSFET	net93	M1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI630	MOSFET	net82	RESET	net81	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	net82	S0	net81	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net81	SET_B	VGND	VNB	nshort	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	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net82	S0	net221	VPB	phighvt	1	0.84	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	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net221	RESET	VPWR	VPB	phighvt	1	0.84	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net82	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.42	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.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net162	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	M1	RESET	net141	VNB	nfet_01v8	1	0.64	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	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.42	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.84	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI667	MOSFET	net93	M1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI630	MOSFET	net82	RESET	net81	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	net82	S0	net81	VNB	nfet_01v8	1	0.64	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.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	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net82	S0	net221	VPB	pfet_01v8_hvt	1	0.84	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	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net221	RESET	VPWR	VPB	pfet_01v8_hvt	1	0.84	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	0.64	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.spice b/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.spice
index bf3dc01..e702cab 100644
--- a/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.spice
+++ b/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__dfbbp_1 CLK D RESET_B SET_B VGND VNB VPB VPWR Q Q_N
-M1000 VGND a_1545_332# a_2317_367# VNB nshort w=420000u l=150000u
-+  ad=1.7962e+12p pd=1.523e+07u as=1.176e+11p ps=1.4e+06u
-M1001 VPWR a_1091_21# a_1823_430# VPB phighvt w=840000u l=150000u
-+  ad=2.80645e+12p pd=2.219e+07u as=2.184e+11p ps=2.2e+06u
-M1002 a_531_47# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1003 a_917_47# SET_B VGND VNB nshort w=640000u l=150000u
-+  ad=3.616e+11p pd=3.69e+06u as=0p ps=0u
-M1004 a_1499_98# a_114_57# a_1307_428# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.139e+11p ps=2e+06u
-M1005 VGND a_1545_332# a_1499_98# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_531_47# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1007 a_1419_512# a_225_47# a_1307_428# VPB phighvt w=420000u l=150000u
-+  ad=2.688e+11p pd=2.12e+06u as=2.772e+11p ps=2.5e+06u
-M1008 VGND a_114_57# a_225_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1009 VPWR a_767_21# a_755_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1010 a_1545_332# SET_B VPWR VPB phighvt w=840000u l=150000u
-+  ad=3.108e+11p pd=2.42e+06u as=0p ps=0u
-M1011 VPWR a_114_57# a_225_47# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1012 a_1319_54# a_767_21# VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1013 a_1307_428# a_225_47# a_1319_54# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1705_54# a_1091_21# a_1545_332# VNB nshort w=640000u l=150000u
-+  ad=3.584e+11p pd=3.68e+06u as=4.28025e+11p ps=3.2e+06u
-M1015 a_1046_379# a_617_47# a_767_21# VPB phighvt w=840000u l=150000u
-+  ad=2.016e+11p pd=2.16e+06u as=2.352e+11p ps=2.24e+06u
-M1016 VPWR a_1091_21# a_1046_379# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1307_428# a_114_57# a_1212_379# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=3.15875e+11p ps=2.82e+06u
-M1018 a_114_57# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1019 a_917_47# a_1091_21# a_767_21# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.816e+11p ps=2.16e+06u
-M1020 a_1705_54# SET_B VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_617_47# a_114_57# a_531_47# VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1022 VPWR a_1545_332# a_2317_367# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1023 a_767_21# a_617_47# a_917_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Q a_2317_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1025 VPWR RESET_B a_1091_21# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1026 a_1212_379# a_767_21# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Q_N a_1545_332# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1028 VGND a_767_21# a_719_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1029 a_1545_332# a_1307_428# a_1705_54# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_767_21# SET_B VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_719_47# a_225_47# a_617_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_617_47# a_225_47# a_531_47# VPB phighvt w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1033 a_114_57# CLK VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1034 a_755_463# a_114_57# a_617_47# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND RESET_B a_1091_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1036 VPWR a_1545_332# a_1419_512# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Q_N a_1545_332# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1038 a_1823_430# a_1307_428# a_1545_332# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 Q a_2317_367# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
+X0 a_755_463# a_767_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_1823_430# a_1091_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 a_531_47# a_225_47# a_617_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_1499_98# a_1545_332# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND D a_531_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_1091_21# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 VGND a_2317_367# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_1545_332# a_1307_428# a_1823_430# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 a_225_47# a_114_57# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_1307_428# a_225_47# a_1419_512# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_1545_332# a_1091_21# a_1705_54# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_767_21# a_1091_21# a_917_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_617_47# a_114_57# a_755_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 a_767_21# a_617_47# a_1046_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 a_2317_367# a_1545_332# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X15 a_1307_428# a_114_57# a_1499_98# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VPWR a_1545_332# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_1319_54# a_225_47# a_1307_428# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 a_2317_367# a_1545_332# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_1046_379# a_1091_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X20 VPWR SET_B a_1545_332# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X21 a_1212_379# a_114_57# a_1307_428# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X22 a_719_47# a_767_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_225_47# a_114_57# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X24 a_1419_512# a_1545_332# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X25 a_1091_21# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VPWR SET_B a_767_21# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X27 VPWR a_2317_367# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 VGND CLK a_114_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 VPWR D a_531_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X30 VPWR a_767_21# a_1212_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X31 a_531_47# a_114_57# a_617_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 VGND a_767_21# a_1319_54# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X33 VGND a_1545_332# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X34 VGND SET_B a_917_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X35 VGND SET_B a_1705_54# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X36 a_917_47# a_617_47# a_767_21# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X37 VPWR CLK a_114_57# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X38 a_617_47# a_225_47# a_719_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 a_1705_54# a_1307_428# a_1545_332# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.cdl b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.cdl
index 1f8adec..dc1aa7b 100644
--- a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.cdl
+++ b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.cdl
@@ -16,72 +16,72 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI651 Q_N s0 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=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.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 net168 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-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.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
-+ 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=0.64 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.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
+MI653 Q net168 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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.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
-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.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=0.64 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=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 net168 VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.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=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 net168 VPB phighvt m=1 w=1.26 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.26 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 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
-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=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 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
 .ENDS sky130_fd_sc_lp__dfrbp_1
diff --git a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.netlist.tsv b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.netlist.tsv
index 2a3d36f..6fa905d 100644
--- a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.netlist.tsv
+++ b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.netlist.tsv
@@ -1,36 +1,36 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	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
-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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net168	VGND	VNB	nshort	1	0.84	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.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
-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	0.64	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net168	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	s0	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	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	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	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
+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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net168	VGND	VNB	nfet_01v8	1	0.84	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.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
+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	0.64	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net168	VPWR	VPB	pfet_01v8_hvt	1	1.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	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
+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	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.spice b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.spice
index b50dae1..c6f9e61 100644
--- a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.spice
+++ b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_lp__dfrbp_1 CLK D RESET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_423_191# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.7428e+12p ps=1.451e+07u
-M1001 VPWR a_1440_304# a_1398_472# VPB phighvt w=420000u l=150000u
-+  ad=1.8202e+12p pd=1.66e+07u as=8.82e+10p ps=1.26e+06u
-M1002 a_1398_472# a_197_108# a_1245_128# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.688e+11p ps=2.43e+06u
-M1003 a_603_191# a_28_108# a_304_463# VNB nshort w=420000u l=150000u
-+  ad=2.709e+11p pd=2.13e+06u as=1.638e+11p ps=1.62e+06u
-M1004 VPWR a_1796_139# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1005 a_1420_128# a_28_108# a_1245_128# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=4.398e+11p ps=2.73e+06u
-M1006 VPWR a_1245_128# a_1440_304# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1007 Q a_1796_139# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1008 Q_N a_1245_128# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1009 VPWR a_804_328# a_789_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1010 a_848_191# a_804_328# a_762_191# VNB nshort w=420000u l=150000u
-+  ad=1.344e+11p pd=1.48e+06u as=1.176e+11p ps=1.4e+06u
-M1011 a_789_463# a_28_108# a_603_191# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.289e+11p ps=2.77e+06u
-M1012 VPWR CLK a_28_108# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1013 a_304_463# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=3.465e+11p pd=4.17e+06u as=0p ps=0u
-M1014 a_197_108# a_28_108# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1015 a_603_191# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1440_304# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1578_128# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1018 a_603_191# a_197_108# a_304_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_762_191# a_197_108# a_603_191# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_804_328# a_603_191# VGND VNB nshort w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1021 a_1245_128# a_197_108# a_804_328# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_304_463# D a_423_191# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Q_N a_1245_128# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1024 a_1440_304# a_1245_128# a_1578_128# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1025 VPWR RESET_B a_304_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND RESET_B a_848_191# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND CLK a_28_108# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1028 a_197_108# a_28_108# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1029 a_1245_128# a_28_108# a_804_328# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=4.6965e+11p ps=3.03e+06u
-M1030 VPWR a_1245_128# a_1796_139# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1031 VGND a_1245_128# a_1796_139# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.883e+11p ps=1.78e+06u
-M1032 a_804_328# a_603_191# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND a_1440_304# a_1420_128# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_304_463# a_28_108# a_603_191# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_804_328# a_28_108# a_1245_128# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 VPWR a_28_108# a_197_108# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_1796_139# a_1245_128# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 a_1796_139# a_1245_128# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR a_1245_128# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_1420_128# a_1440_304# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_789_463# a_804_328# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VPWR RESET_B a_603_191# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_28_108# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X10 VPWR RESET_B a_1440_304# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_1578_128# a_1245_128# a_1440_304# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND a_1796_139# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_1245_128# a_28_108# a_1420_128# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 Q a_1796_139# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VGND a_1245_128# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 VPWR D a_304_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 VGND a_28_108# a_197_108# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_1440_304# a_1245_128# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 VGND a_603_191# a_804_328# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X20 a_1245_128# a_197_108# a_1398_472# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 a_28_108# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_762_191# a_804_328# a_848_191# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_423_191# D a_304_463# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_804_328# a_197_108# a_1245_128# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X25 a_1398_472# a_1440_304# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X26 VGND RESET_B a_1578_128# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_304_463# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 a_603_191# a_28_108# a_789_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X29 VGND RESET_B a_423_191# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_603_191# a_197_108# a_762_191# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_304_463# a_197_108# a_603_191# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X32 VPWR a_603_191# a_804_328# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X33 a_848_191# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.cdl b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.cdl
index c293f0d..c2bb2dc 100644
--- a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.cdl
+++ b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.cdl
@@ -16,72 +16,72 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI651 Q_N s0 VNB nfet_01v8 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
-MI46 clkpos clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=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 net167 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
-MI653 Q net167 VNB nshort 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
-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.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
-+ 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 net75 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.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=0.64 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
-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 net195 net92 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 net92 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI652 net167 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
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 Q net167 VNB nfet_01v8 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
+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.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
-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 net174 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI38 net75 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=0.64 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 net195 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 net174 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 net167 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
+MI660 Q net167 VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.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 net167 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
-MI660 Q net167 VPB phighvt m=2 w=1.26 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.26 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 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
-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=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 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
 .ENDS sky130_fd_sc_lp__dfrbp_2
diff --git a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.netlist.tsv b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.netlist.tsv
index a093785..5b3fce5 100644
--- a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.netlist.tsv
+++ b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.netlist.tsv
@@ -1,36 +1,36 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	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
-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	net167	s0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net167	VGND	VNB	nshort	2	0.84	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.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
-MI39	MOSFET	db	D	net75	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net75	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	0.64	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	net195	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	net195	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	net174	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	net174	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	net167	s0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net167	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	s0	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	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	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	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
+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	net167	s0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net167	VGND	VNB	nfet_01v8	2	0.84	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.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
+MI39	MOSFET	db	D	net75	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net75	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	0.64	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	net195	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	net195	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	net174	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	net174	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	net167	s0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net167	VPWR	VPB	pfet_01v8_hvt	2	1.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	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
+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	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.spice b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.spice
index 59bd570..6473806 100644
--- a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.spice
+++ b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_lp__dfrbp_2 CLK D RESET_B VGND VNB VPB VPWR Q Q_N
-M1000 VPWR a_811_341# a_793_463# VPB phighvt w=420000u l=150000u
-+  ad=2.6097e+12p pd=2.302e+07u as=8.82e+10p ps=1.26e+06u
-M1001 a_427_191# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.0883e+12p ps=1.851e+07u
-M1002 a_784_191# a_196_79# a_637_191# VNB nshort w=420000u l=150000u
-+  ad=9.87e+10p pd=1.31e+06u as=2.457e+11p ps=2.01e+06u
-M1003 a_1582_128# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 VGND a_1272_128# a_2028_367# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 VPWR CLK a_27_79# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1006 a_196_79# a_27_79# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1007 a_811_341# a_637_191# VGND VNB nshort w=640000u l=150000u
-+  ad=2.528e+11p pd=2.07e+06u as=0p ps=0u
-M1008 a_308_463# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=3.465e+11p pd=4.17e+06u as=0p ps=0u
-M1009 VPWR a_1272_128# Q_N VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1010 Q_N a_1272_128# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1011 a_1444_320# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1012 a_637_191# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=0p ps=0u
-M1013 a_1272_128# a_196_79# a_811_341# VNB nshort w=640000u l=150000u
-+  ad=3.662e+11p pd=2.5e+06u as=0p ps=0u
-M1014 VPWR a_1272_128# a_2028_367# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1015 a_1424_128# a_27_79# a_1272_128# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1016 VPWR RESET_B a_308_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_1272_128# a_1444_320# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_2028_367# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1019 a_637_191# a_196_79# a_308_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_196_79# a_27_79# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1021 Q a_2028_367# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1022 VGND a_1272_128# Q_N VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Q_N a_1272_128# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1272_128# a_27_79# a_811_341# VPB phighvt w=840000u l=150000u
-+  ad=2.688e+11p pd=2.43e+06u as=4.82025e+11p ps=3.03e+06u
-M1025 a_811_341# a_637_191# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Q a_2028_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_308_463# D a_427_191# VNB nshort w=420000u l=150000u
-+  ad=2.268e+11p pd=1.92e+06u as=0p ps=0u
-M1028 a_637_191# a_27_79# a_308_463# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1444_320# a_1272_128# a_1582_128# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1030 VGND a_2028_367# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1402_496# a_196_79# a_1272_128# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1032 VGND RESET_B a_861_191# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1033 VGND CLK a_27_79# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1034 a_861_191# a_811_341# a_784_191# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_793_463# a_27_79# a_637_191# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR a_1444_320# a_1402_496# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND a_1444_320# a_1424_128# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_27_79# a_196_79# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR a_1272_128# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_308_463# a_196_79# a_637_191# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VPWR a_637_191# a_811_341# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 VPWR RESET_B a_1444_320# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VGND RESET_B a_427_191# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_861_191# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_811_341# a_27_79# a_1272_128# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 a_784_191# a_811_341# a_861_191# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND a_637_191# a_811_341# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 Q_N a_1272_128# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_811_341# a_196_79# a_1272_128# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_2028_367# a_1272_128# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 a_308_463# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 a_637_191# a_27_79# a_793_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 a_793_463# a_811_341# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 VPWR RESET_B a_637_191# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 a_27_79# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_1424_128# a_1444_320# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_27_79# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 a_2028_367# a_1272_128# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_1582_128# a_1272_128# a_1444_320# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 VPWR a_27_79# a_196_79# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X23 a_1272_128# a_27_79# a_1424_128# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VPWR D a_308_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X25 VGND a_2028_367# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 a_1272_128# a_196_79# a_1402_496# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X27 a_1402_496# a_1444_320# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 Q a_2028_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 VGND RESET_B a_1582_128# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 VPWR a_2028_367# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 VGND a_1272_128# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X32 a_308_463# a_27_79# a_637_191# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 Q_N a_1272_128# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X34 a_637_191# a_196_79# a_784_191# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 a_1444_320# a_1272_128# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X36 a_427_191# D a_308_463# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 Q a_2028_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.cdl b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.cdl
index 6721ed0..2bdef40 100644
--- a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.cdl
+++ b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.cdl
@@ -16,106 +16,106 @@
 
 .SUBCKT sky130_fd_sc_lp__dfrbp_lp 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI651 Q_N s0 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=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 net114 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 net144 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 net137 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net114 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 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
-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 net229 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
-MI653 Q net229 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net113 net114 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net144 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
-MI64 net156 s0 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI44 clkneg CLK VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI55 net96 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
-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
-MI62 net93 net229 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI33 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.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
+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
-MI38 net85 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI34 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
-MI61 net81 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
-MI649 M1 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
-MI51 net73 clkneg VNB nshort 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
-MI50 net104 CLK VNB nshort m=1 w=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=0.64 l=0.15 mult=1 sa=0.265
+MI652 net229 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
-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 net261 net114 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 Q net229 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI659 net114 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI654 net113 net114 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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
-MI658 net114 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
-MI58 net245 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI64 net156 s0 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net236 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 net229 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
-MI660 Q net229 VPB phighvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI52 net217 clkneg VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI55 net96 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
-MI63 net220 s0 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+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
-MI54 net200 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
-MI648 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
-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
-MI60 net189 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
-MI650 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
-MI59 net224 net229 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MI62 net93 net229 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI57 net177 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
-MI56 net173 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI38 net85 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
-MI53 net169 CLK VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI61 net81 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
-MI49 net165 RESET_B VPB phighvt 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
-MI48 net161 D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI51 net73 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
+MI50 net104 CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI47 clkpos clkneg 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
+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 net261 net114 VPB pfet_01v8_hvt m=1 w=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 net114 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 net114 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
+MI58 net245 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
+MI30 net236 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 net229 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
+MI660 Q net229 VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI52 net217 clkneg 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 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
+MI63 net220 s0 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI54 net200 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
+MI648 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
+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
+MI60 net189 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
+MI650 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
+MI59 net224 net229 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI57 net177 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
+MI56 net173 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
+MI53 net169 CLK 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
+MI49 net165 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
+MI48 net161 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
 .ENDS sky130_fd_sc_lp__dfrbp_lp
diff --git a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.netlist.tsv b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.netlist.tsv
index 6732e36..6c97f5a 100644
--- a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.netlist.tsv
+++ b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.netlist.tsv
@@ -1,53 +1,53 @@
 sky130_fd_sc_lp__dfrbp_lp	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	net156	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	net73	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
-MI656	MOSFET	net114	s0	net144	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net144	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net137	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	net129	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net129	M1	net137	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net113	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net229	s0	net81	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net229	net93	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net113	net114	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI64	MOSFET	net156	s0	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	net104	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI55	MOSFET	net96	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	net96	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI62	MOSFET	net93	net229	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	net85	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net85	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI61	MOSFET	net81	s0	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
-MI51	MOSFET	net73	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI50	MOSFET	net104	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	net217	VPB	phighvt	1	0.64	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	net261	net114	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net114	RESET_B	net245	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net261	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net114	s0	net177	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI58	MOSFET	net245	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net236	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	net236	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	net173	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net229	s0	net189	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net229	net224	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	s0	net220	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI52	MOSFET	net217	clkneg	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	net169	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI63	MOSFET	net220	s0	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI54	MOSFET	net200	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	net200	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	db	RESET_B	net165	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	db	D	net161	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI60	MOSFET	net189	s0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI59	MOSFET	net224	net229	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI57	MOSFET	net177	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI56	MOSFET	net173	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI53	MOSFET	net169	CLK	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	net165	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI48	MOSFET	net161	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	s0	net156	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	net73	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
+MI656	MOSFET	net114	s0	net144	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net144	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	net137	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	net129	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net129	M1	net137	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net113	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net229	s0	net81	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net229	net93	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net113	net114	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI64	MOSFET	net156	s0	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	net104	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI55	MOSFET	net96	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	M1	M0	net96	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI62	MOSFET	net93	net229	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	net85	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net85	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI61	MOSFET	net81	s0	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
+MI51	MOSFET	net73	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI50	MOSFET	net104	CLK	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	net217	VPB	pfet_01v8_hvt	1	0.64	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	net261	net114	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net114	RESET_B	net245	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	net261	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net114	s0	net177	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI58	MOSFET	net245	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net236	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	net236	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	net173	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net229	s0	net189	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net229	net224	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	s0	net220	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI52	MOSFET	net217	clkneg	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	net169	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI63	MOSFET	net220	s0	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI54	MOSFET	net200	M0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	net200	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	db	RESET_B	net165	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	net161	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI60	MOSFET	net189	s0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	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
+MI59	MOSFET	net224	net229	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI57	MOSFET	net177	s0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI56	MOSFET	net173	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI53	MOSFET	net169	CLK	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	net165	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI48	MOSFET	net161	D	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/dfrbp/sky130_fd_sc_lp__dfrbp_lp.spice b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.spice
index 8f86798..1410e30 100644
--- a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.spice
+++ b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.spice
@@ -16,106 +16,55 @@
 
 
 .subckt sky130_fd_sc_lp__dfrbp_lp CLK D RESET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_1301_373# a_590_116# a_817_90# VPB phighvt w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=4.662e+11p ps=4.47e+06u
-M1001 VPWR RESET_B a_2451_397# VPB phighvt w=420000u l=150000u
-+  ad=2.09115e+12p pd=1.773e+07u as=8.82e+10p ps=1.26e+06u
-M1002 VPWR a_817_90# a_484_411# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=5.00725e+11p ps=4.34e+06u
-M1003 a_847_116# a_817_90# a_692_116# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.625e+11p ps=2.09e+06u
-M1004 a_1301_67# a_590_116# a_817_90# VNB nshort w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=4.16e+11p ps=3.86e+06u
-M1005 VGND a_590_116# a_1301_67# VNB nshort w=640000u l=150000u
-+  ad=2.1398e+12p pd=1.59e+07u as=0p ps=0u
-M1006 a_1496_111# a_560_90# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1007 VPWR a_590_116# a_1301_373# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_2102_25# a_1799_379# a_2185_397# VPB phighvt w=420000u l=150000u
-+  ad=2.142e+11p pd=1.86e+06u as=3.318e+11p ps=3.26e+06u
-M1009 a_1037_457# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1010 a_111_457# a_662_90# a_590_116# VPB phighvt w=420000u l=150000u
-+  ad=2.331e+11p pd=2.79e+06u as=2.31e+11p ps=2.78e+06u
-M1011 Q_N a_1799_379# a_3036_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=2.646e+11p ps=2.94e+06u
-M1012 a_27_457# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.268e+11p pd=2.76e+06u as=0p ps=0u
-M1013 VPWR a_2102_25# a_1712_379# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.82e+06u
-M1014 a_197_457# RESET_B a_111_457# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1015 a_3490_53# a_3222_137# VGND VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1016 a_590_116# a_560_90# a_111_457# VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=2.793e+11p ps=2.17e+06u
-M1017 a_2451_397# RESET_B a_2102_25# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Q a_3222_137# a_3490_53# VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1019 a_1799_379# a_662_90# a_1712_379# VPB phighvt w=420000u l=150000u
-+  ad=2.772e+11p pd=2.45e+06u as=0p ps=0u
-M1020 a_2185_397# a_1799_379# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1799_379# a_662_90# a_817_90# VNB nshort w=640000u l=150000u
-+  ad=2.286e+11p pd=2.07e+06u as=0p ps=0u
-M1022 VPWR RESET_B a_197_457# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_111_457# D a_349_116# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1024 a_590_116# a_560_90# a_484_411# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_1799_379# a_3309_367# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.7e+06u
-M1026 a_2825_48# CLK a_560_90# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1027 VGND CLK a_2825_48# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_3309_367# a_1799_379# a_3222_137# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1029 a_2493_51# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1030 a_2102_25# a_1799_379# a_2493_51# VNB nshort w=420000u l=150000u
-+  ad=2.173e+11p pd=1.98e+06u as=0p ps=0u
-M1031 a_3036_367# a_1799_379# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND a_2102_25# a_2000_51# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.142e+11p ps=1.86e+06u
-M1033 a_349_116# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR CLK a_2831_367# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.7e+06u
-M1035 Q_N a_1799_379# a_3036_48# VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=1.764e+11p ps=2.1e+06u
-M1036 a_2000_51# a_560_90# a_1799_379# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_3490_367# a_3222_137# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1038 a_590_116# RESET_B a_1037_457# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_1480_413# a_560_90# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1040 VGND RESET_B a_847_116# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_662_90# a_560_90# a_1496_111# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1042 a_3309_137# a_1799_379# a_3222_137# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1043 a_111_457# D a_27_457# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_817_90# a_560_90# a_1799_379# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_692_116# a_662_90# a_590_116# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 Q a_3222_137# a_3490_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1047 a_662_90# a_560_90# a_1480_413# VPB phighvt w=640000u l=150000u
-+  ad=3.924e+11p pd=3.08e+06u as=0p ps=0u
-M1048 VGND a_1799_379# a_3309_137# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 a_2831_367# CLK a_560_90# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.76e+11p ps=1.83e+06u
-M1050 a_3036_48# a_1799_379# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1712_379# a_662_90# a_1799_379# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_560_90# CLK a_2831_367# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_3036_367# a_1799_379# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_847_116# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_1496_111# a_560_90# a_662_90# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND RESET_B a_2493_51# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_3222_137# a_1799_379# a_3309_137# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_2451_397# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VGND a_3222_137# a_3490_53# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_590_116# a_662_90# a_111_457# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_590_116# a_662_90# a_692_116# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_484_411# a_560_90# a_590_116# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 a_1301_67# a_590_116# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 a_2185_397# a_1799_379# a_2102_25# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 a_2825_48# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_1712_379# a_2102_25# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 VGND a_560_90# a_1496_111# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VPWR a_1799_379# a_2185_397# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 a_692_116# a_817_90# a_847_116# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_817_90# a_662_90# a_1799_379# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X20 a_817_90# a_590_116# a_1301_373# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X21 a_1301_373# a_590_116# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X22 a_111_457# a_560_90# a_590_116# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VPWR a_560_90# a_1480_413# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X24 a_1480_413# a_560_90# a_662_90# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X25 a_1037_457# RESET_B a_590_116# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X26 a_3309_137# a_1799_379# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 VGND a_1799_379# a_3036_48# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X28 a_484_411# a_817_90# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X29 a_2831_367# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X30 a_2000_51# a_2102_25# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 VPWR a_1799_379# a_3036_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X32 a_3222_137# a_1799_379# a_3309_367# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X33 a_817_90# a_590_116# a_1301_67# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X34 a_3036_48# a_1799_379# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X35 a_560_90# CLK a_2825_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 a_349_116# D a_111_457# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 a_2102_25# RESET_B a_2451_397# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X38 a_2493_51# a_1799_379# a_2102_25# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 VPWR a_3222_137# a_3490_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X40 a_3490_53# a_3222_137# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X41 a_111_457# RESET_B a_197_457# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X42 a_197_457# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X43 a_3490_367# a_3222_137# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X44 a_1799_379# a_560_90# a_817_90# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X45 a_3309_367# a_1799_379# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X46 VGND RESET_B a_349_116# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X47 VPWR D a_27_457# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X48 VPWR RESET_B a_1037_457# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X49 a_1799_379# a_560_90# a_2000_51# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X50 a_27_457# D a_111_457# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.cdl b/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.cdl
index e63c800..3aa77f8 100644
--- a/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.cdl
+++ b/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265
+MI46 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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 net86 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 net116 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 net109 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net86 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 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
-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 net153 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
-MI653 Q net153 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net85 net86 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 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
-MI44 clkpos CLK_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI33 net109 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
+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 net69 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI34 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
-MI649 M1 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
-MI47 clkneg clkpos 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
-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 net172 net86 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI652 net153 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
-MI659 net86 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 Q net153 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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
-MI658 net86 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 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
-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 net153 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
-MI660 Q net153 VPB phighvt m=1 w=1.26 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=0.64 l=0.15 mult=1 sa=0.265
+MI654 net85 net86 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M1 M0 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI44 clkpos CLK_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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
-MI41 db RESET_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
-MI40 db D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI38 net69 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 clkneg 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
+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 net172 net86 VPB pfet_01v8_hvt m=1 w=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 net86 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 net86 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 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
+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 net153 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
+MI660 Q net153 VPB pfet_01v8_hvt m=1 w=1.26 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=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 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
+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
-MI650 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
+MI650 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
 .ENDS sky130_fd_sc_lp__dfrtn_1
diff --git a/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.netlist.tsv b/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.netlist.tsv
index c58d492..92d2ce2 100644
--- a/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.netlist.tsv
+++ b/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_lp__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.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
-MI656	MOSFET	net86	s0	net116	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net116	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net109	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	net101	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net101	M1	net109	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net85	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net153	s0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net153	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net85	net86	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.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
-MI39	MOSFET	db	D	net69	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net69	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	clkneg	clkpos	VPWR	VPB	phighvt	1	0.64	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	net172	net86	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net86	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	net172	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net86	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net160	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	net160	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	net153	s0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net153	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	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	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	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
+MI656	MOSFET	net86	s0	net116	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	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
+MI33	MOSFET	net109	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	net101	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net101	M1	net109	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net85	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net153	s0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net153	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net85	net86	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.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
+MI39	MOSFET	db	D	net69	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net69	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	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	0.64	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	net172	net86	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net86	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	net172	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net86	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	net160	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	net160	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	net153	s0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net153	VPWR	VPB	pfet_01v8_hvt	1	1.26	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	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
+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	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.spice b/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.spice
index 167a6a1..c2ecb21 100644
--- a/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.spice
+++ b/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_lp__dfrtn_1 CLK_N D RESET_B VGND VNB VPB VPWR Q
-M1000 a_1287_276# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.809e+11p pd=2.32e+06u as=1.89637e+12p ps=1.497e+07u
-M1001 a_336_463# a_294_35# a_27_463# VNB nshort w=420000u l=150000u
-+  ad=1.218e+11p pd=1.42e+06u as=2.236e+11p ps=1.92e+06u
-M1002 a_447_463# a_294_35# a_336_463# VPB phighvt w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=2.814e+11p ps=3.02e+06u
-M1003 a_1099_447# a_294_35# a_501_229# VPB phighvt w=840000u l=150000u
-+  ad=3.213e+11p pd=2.68e+06u as=2.352e+11p ps=2.24e+06u
-M1004 a_27_463# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.457e+11p pd=2.85e+06u as=0p ps=0u
-M1005 a_1229_531# a_306_277# a_1099_447# VPB phighvt w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1006 a_540_123# a_501_229# a_438_123# VNB nshort w=420000u l=150000u
-+  ad=1.449e+11p pd=1.53e+06u as=1.512e+11p ps=1.56e+06u
-M1007 a_1099_447# a_306_277# a_501_229# VNB nshort w=640000u l=150000u
-+  ad=2.922e+11p pd=2.52e+06u as=2.816e+11p ps=2.16e+06u
-M1008 VPWR a_306_277# a_294_35# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.3925e+11p ps=2.18e+06u
-M1009 a_306_277# CLK_N VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1010 Q a_1832_367# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=1.41843e+12p ps=1.254e+07u
-M1011 a_438_123# a_306_277# a_336_463# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Q a_1832_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1013 VGND a_1287_276# a_1275_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1014 a_1287_276# a_1099_447# a_1465_125# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1015 VPWR a_501_229# a_447_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_306_277# a_294_35# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.26e+11p ps=1.44e+06u
-M1017 a_501_229# a_336_463# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1275_125# a_294_35# a_1099_447# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1465_125# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_27_463# D a_142_121# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1021 VPWR a_1099_447# a_1287_276# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_336_463# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_142_121# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_1099_447# a_1832_367# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1025 VGND CLK_N a_306_277# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1026 VGND a_1099_447# a_1832_367# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1027 VPWR a_1287_276# a_1229_531# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_501_229# a_336_463# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR RESET_B a_27_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_336_463# a_306_277# a_27_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND RESET_B a_540_123# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_463# a_306_277# a_336_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VPWR CLK_N a_306_277# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_294_35# a_306_277# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_336_463# a_294_35# a_447_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VGND RESET_B a_142_121# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_540_123# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND RESET_B a_1465_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_1099_447# a_306_277# a_1229_531# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_1275_125# a_1287_276# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR a_1832_367# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_294_35# a_306_277# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 VPWR a_336_463# a_501_229# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X12 a_438_123# a_501_229# a_540_123# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_1832_367# a_1099_447# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 a_27_463# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 VPWR D a_27_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 VPWR RESET_B a_1287_276# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 a_1099_447# a_294_35# a_1275_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_1287_276# a_1099_447# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 a_142_121# D a_27_463# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VGND a_336_463# a_501_229# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 a_501_229# a_306_277# a_1099_447# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 a_27_463# a_294_35# a_336_463# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_306_277# CLK_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_1229_531# a_1287_276# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X25 VPWR RESET_B a_336_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X26 a_336_463# a_306_277# a_438_123# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_1465_125# a_1099_447# a_1287_276# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_447_463# a_501_229# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X29 a_501_229# a_294_35# a_1099_447# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X30 a_1832_367# a_1099_447# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 VGND a_1832_367# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.cdl b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.cdl
index adc0a9f..02bcc6d 100644
--- a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.cdl
+++ b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=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 net86 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 net116 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 net109 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net86 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 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
-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 net153 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
-MI653 Q net153 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net85 net86 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 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
-MI44 clkneg CLK VNB nshort m=1 w=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
-+ 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 net69 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI33 net109 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=0.64 l=0.15 mult=1 sa=0.265
+MI34 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
-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 net181 net86 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 net86 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI652 net153 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
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 Q net153 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net85 net86 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net86 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 net160 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI38 net69 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=0.64 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 net181 net86 VPB pfet_01v8_hvt m=1 w=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 net86 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 net86 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 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
+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 net153 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
+MI660 Q net153 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.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 net153 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
-MI660 Q net153 VPB phighvt m=1 w=1.26 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 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
-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=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 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
 .ENDS sky130_fd_sc_lp__dfrtp_1
diff --git a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.netlist.tsv b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.netlist.tsv
index 5172598..159431f 100644
--- a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.netlist.tsv
+++ b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_lp__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.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
-MI656	MOSFET	net86	s0	net116	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net116	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net109	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	net101	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net101	M1	net109	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net85	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net153	s0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net153	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net85	net86	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.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
-MI39	MOSFET	db	D	net69	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net69	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	0.64	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	net181	net86	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net86	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	net181	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net86	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net160	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	net160	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	net153	s0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net153	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	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	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	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
+MI656	MOSFET	net86	s0	net116	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	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
+MI33	MOSFET	net109	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	net101	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net101	M1	net109	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net85	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net153	s0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net153	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net85	net86	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.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
+MI39	MOSFET	db	D	net69	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net69	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	0.64	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	net181	net86	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net86	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	net181	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net86	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	net160	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	net160	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	net153	s0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net153	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	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
+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	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.spice b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.spice
index e8ec847..79826b8 100644
--- a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.spice
+++ b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_lp__dfrtp_1 CLK D RESET_B VGND VNB VPB VPWR Q
-M1000 VGND a_1467_419# a_1417_133# VNB nshort w=420000u l=150000u
-+  ad=1.0768e+12p pd=9.77e+06u as=1.26e+11p ps=1.44e+06u
-M1001 a_1593_133# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1002 a_304_533# D a_492_149# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=8.82e+10p ps=1.26e+06u
-M1003 a_1467_419# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.5729e+12p ps=1.408e+07u
-M1004 a_559_533# a_27_114# a_304_533# VNB nshort w=420000u l=150000u
-+  ad=2.583e+11p pd=2.07e+06u as=0p ps=0u
-M1005 a_1379_517# a_196_462# a_1247_89# VPB phighvt w=420000u l=150000u
-+  ad=1.848e+11p pd=1.72e+06u as=2.688e+11p ps=2.43e+06u
-M1006 a_196_462# a_27_114# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1007 VPWR RESET_B a_304_533# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.289e+11p ps=2.77e+06u
-M1008 VPWR a_1247_89# a_1467_419# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_653_533# a_27_114# a_559_533# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.457e+11p ps=2.85e+06u
-M1010 a_492_149# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1247_89# a_27_114# a_695_375# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=3.332e+11p ps=2.49e+06u
-M1012 a_695_375# a_559_533# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND CLK a_27_114# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1014 VGND RESET_B a_875_149# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.869e+11p ps=2.04e+06u
-M1015 a_559_533# a_196_462# a_304_533# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_1467_419# a_1379_517# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_1247_89# a_1832_367# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1018 a_875_149# a_695_375# a_803_149# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1019 Q a_1832_367# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1020 VPWR CLK a_27_114# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1021 a_304_533# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_559_533# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR a_1247_89# a_1832_367# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1024 Q a_1832_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1025 a_1467_419# a_1247_89# a_1593_133# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1026 a_196_462# a_27_114# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1027 a_803_149# a_196_462# a_559_533# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_695_375# a_559_533# VGND VNB nshort w=640000u l=150000u
-+  ad=3.641e+11p pd=2.56e+06u as=0p ps=0u
-M1029 VPWR a_695_375# a_653_533# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1417_133# a_27_114# a_1247_89# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=4.04e+11p ps=2.68e+06u
-M1031 a_1247_89# a_196_462# a_695_375# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_27_114# a_196_462# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_304_533# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VPWR RESET_B a_559_533# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VGND a_1832_367# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_1417_133# a_1467_419# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_559_533# a_27_114# a_653_533# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_492_149# D a_304_533# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_695_375# a_27_114# a_1247_89# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 a_1832_367# a_1247_89# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 a_1247_89# a_196_462# a_1379_517# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_1593_133# a_1247_89# a_1467_419# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_304_533# a_196_462# a_559_533# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 VPWR a_27_114# a_196_462# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 VPWR D a_304_533# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 a_803_149# a_695_375# a_875_149# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_695_375# a_196_462# a_1247_89# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 VGND RESET_B a_492_149# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VPWR a_559_533# a_695_375# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X18 VGND RESET_B a_1593_133# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_27_114# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 a_304_533# a_27_114# a_559_533# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_559_533# a_196_462# a_803_149# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_1467_419# a_1247_89# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X23 a_27_114# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VPWR a_1832_367# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 a_1832_367# a_1247_89# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_1247_89# a_27_114# a_1417_133# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_875_149# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_653_533# a_695_375# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X29 VPWR RESET_B a_1467_419# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X30 VGND a_559_533# a_695_375# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X31 a_1379_517# a_1467_419# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.cdl b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.cdl
index 8dd1711..c6d2a66 100644
--- a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.cdl
+++ b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=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 net86 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 net116 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 net109 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net86 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 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
-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 net153 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
-MI653 Q net153 VNB nshort 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
-MI654 net85 net86 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 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
-MI44 clkneg CLK VNB nshort m=1 w=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
-+ 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 net69 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI33 net109 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=0.64 l=0.15 mult=1 sa=0.265
+MI34 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
-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 net181 net86 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 net86 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI652 net153 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
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 Q net153 VNB nfet_01v8 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
+MI654 net85 net86 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net86 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 net160 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI38 net69 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=0.64 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 net181 net86 VPB pfet_01v8_hvt m=1 w=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 net86 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 net86 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 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
+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 net153 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
+MI660 Q net153 VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.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 net153 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
-MI660 Q net153 VPB phighvt m=2 w=1.26 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 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
-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=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 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
 .ENDS sky130_fd_sc_lp__dfrtp_2
diff --git a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.netlist.tsv b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.netlist.tsv
index a954e16..ca3628e 100644
--- a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.netlist.tsv
+++ b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_lp__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.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
-MI656	MOSFET	net86	s0	net116	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net116	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net109	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	net101	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net101	M1	net109	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net85	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net153	s0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net153	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net85	net86	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.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
-MI39	MOSFET	db	D	net69	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net69	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	0.64	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	net181	net86	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net86	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	net181	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net86	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net160	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	net160	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	net153	s0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net153	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	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	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	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
+MI656	MOSFET	net86	s0	net116	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	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
+MI33	MOSFET	net109	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	net101	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net101	M1	net109	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net85	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net153	s0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net153	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net85	net86	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.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
+MI39	MOSFET	db	D	net69	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net69	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	0.64	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	net181	net86	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net86	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	net181	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net86	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	net160	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	net160	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	net153	s0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net153	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	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
+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	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.spice b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.spice
index 7192735..f7292d3 100644
--- a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.spice
+++ b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_lp__dfrtp_2 CLK D RESET_B VGND VNB VPB VPWR Q
-M1000 VPWR a_1252_451# a_1836_47# VPB phighvt w=640000u l=150000u
-+  ad=2.1846e+12p pd=1.806e+07u as=1.696e+11p ps=1.81e+06u
-M1001 VPWR RESET_B a_318_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.289e+11p ps=2.77e+06u
-M1002 a_318_535# D a_483_78# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.799e+11p ps=1.97e+06u
-M1003 VPWR CLK a_27_101# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1004 a_573_535# a_27_101# a_318_535# VNB nshort w=420000u l=150000u
-+  ad=2.31e+11p pd=1.94e+06u as=0p ps=0u
-M1005 VPWR a_1399_473# a_1357_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1006 a_667_535# a_27_101# a_573_535# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.457e+11p ps=2.85e+06u
-M1007 a_709_411# a_573_535# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1008 VPWR a_709_411# a_667_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND CLK a_27_101# VNB nshort w=420000u l=150000u
-+  ad=1.3485e+12p pd=1.194e+07u as=1.113e+11p ps=1.37e+06u
-M1010 a_573_535# a_196_464# a_318_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_573_535# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_1399_125# a_27_101# a_1252_451# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=2.991e+11p ps=2.4e+06u
-M1013 VGND a_1252_451# a_1836_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1014 a_883_119# a_709_411# a_811_119# VNB nshort w=420000u l=150000u
-+  ad=1.704e+11p pd=1.74e+06u as=8.82e+10p ps=1.26e+06u
-M1015 a_1357_535# a_196_464# a_1252_451# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.688e+11p ps=2.43e+06u
-M1016 VPWR a_1252_451# a_1399_473# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1017 a_709_411# a_573_535# VGND VNB nshort w=640000u l=150000u
-+  ad=2.912e+11p pd=2.19e+06u as=0p ps=0u
-M1018 a_1399_473# a_1252_451# a_1593_125# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1019 a_196_464# a_27_101# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1020 a_1252_451# a_196_464# a_709_411# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_196_464# a_27_101# VGND VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1022 Q a_1836_47# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1023 a_811_119# a_196_464# a_573_535# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_1399_473# a_1399_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_1836_47# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_318_535# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND RESET_B a_883_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1593_125# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Q a_1836_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1030 a_1252_451# a_27_101# a_709_411# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1399_473# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_483_78# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR a_1836_47# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_27_101# a_196_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 VGND a_573_535# a_709_411# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X2 a_709_411# a_196_464# a_1252_451# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 a_27_101# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 VPWR RESET_B a_1399_473# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_1252_451# a_27_101# a_1399_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_483_78# D a_318_535# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_318_535# a_196_464# a_573_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_811_119# a_709_411# a_883_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 Q a_1836_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VGND a_27_101# a_196_464# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_1252_451# a_196_464# a_1357_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 a_27_101# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_573_535# a_196_464# a_811_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_1399_473# a_1252_451# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 a_1399_125# a_1399_473# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_318_535# a_27_101# a_573_535# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VPWR a_1836_47# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VGND a_1836_47# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 VPWR a_573_535# a_709_411# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X20 a_1593_125# a_1252_451# a_1399_473# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_1836_47# a_1252_451# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 VGND RESET_B a_483_78# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VPWR RESET_B a_573_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X24 a_1836_47# a_1252_451# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X25 VGND RESET_B a_1593_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_883_119# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_709_411# a_27_101# a_1252_451# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X28 a_573_535# a_27_101# a_667_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X29 a_667_535# a_709_411# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X30 a_1357_535# a_1399_473# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X31 a_318_535# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X32 VPWR D a_318_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X33 Q a_1836_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.cdl b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.cdl
index 673f9d7..e3e6a2e 100644
--- a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.cdl
+++ b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265
+MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI42 db clkneg VNB nshort m=1 w=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 net86 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 net116 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 net109 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net86 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 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
-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 net153 s0 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net153 VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net85 net86 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 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
-MI44 clkneg CLK VNB nshort m=1 w=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
-+ 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 net69 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI33 net109 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=0.64 l=0.15 mult=1 sa=0.265
+MI34 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
-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 net172 net86 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 net86 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI652 net153 s0 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 Q net153 VNB nfet_01v8 m=4 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net85 net86 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net86 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 net160 M1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI38 net69 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=0.64 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 net172 net86 VPB pfet_01v8_hvt m=1 w=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 net86 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 net86 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 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
+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 net153 s0 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net153 VPB pfet_01v8_hvt m=4 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.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 net153 s0 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net153 VPB phighvt m=4 w=1.26 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 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
-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=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 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
 .ENDS sky130_fd_sc_lp__dfrtp_4
diff --git a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.netlist.tsv b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.netlist.tsv
index eea7a6a..ddba062 100644
--- a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.netlist.tsv
+++ b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_lp__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.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
-MI656	MOSFET	net86	s0	net116	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net116	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net109	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	net101	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net101	M1	net109	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net85	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net153	s0	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net153	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net85	net86	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.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
-MI39	MOSFET	db	D	net69	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net69	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	0.64	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	net172	net86	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net86	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	net172	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net86	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net160	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	net160	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	net153	s0	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net153	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	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	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	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
+MI656	MOSFET	net86	s0	net116	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	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
+MI33	MOSFET	net109	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	net101	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net101	M1	net109	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net85	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net153	s0	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net153	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net85	net86	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.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
+MI39	MOSFET	db	D	net69	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net69	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	0.64	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	net172	net86	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net86	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	net172	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net86	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	net160	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	net160	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	net153	s0	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net153	VPWR	VPB	pfet_01v8_hvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	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
+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	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.spice b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.spice
index e9d4e36..3024f25 100644
--- a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.spice
+++ b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_lp__dfrtp_4 CLK D RESET_B VGND VNB VPB VPWR Q
-M1000 VPWR a_731_405# a_689_535# VPB phighvt w=420000u l=150000u
-+  ad=2.2964e+12p pd=2.049e+07u as=8.82e+10p ps=1.26e+06u
-M1001 a_689_535# a_27_90# a_595_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.457e+11p ps=2.85e+06u
-M1002 a_1449_133# a_27_90# a_1255_449# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=4.988e+11p ps=2.98e+06u
-M1003 a_1697_133# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.6766e+12p ps=1.486e+07u
-M1004 Q a_1891_47# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1005 VPWR a_1891_47# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1006 Q a_1891_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_595_535# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_595_535# a_27_90# a_340_535# VNB nshort w=420000u l=150000u
-+  ad=2.31e+11p pd=1.94e+06u as=1.176e+11p ps=1.4e+06u
-M1009 a_595_535# a_216_462# a_340_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.289e+11p ps=2.77e+06u
-M1010 VGND RESET_B a_905_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.715e+11p ps=1.76e+06u
-M1011 VPWR a_1255_449# a_1891_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1012 a_1255_449# a_216_462# a_731_405# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=3.67e+11p ps=2.58e+06u
-M1013 a_216_462# a_27_90# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1014 a_1255_449# a_27_90# a_731_405# VPB phighvt w=840000u l=150000u
-+  ad=3.3395e+11p pd=2.63e+06u as=2.352e+11p ps=2.24e+06u
-M1015 VGND a_1891_47# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_1475_426# a_1380_488# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.995e+11p ps=1.79e+06u
-M1017 Q a_1891_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_340_535# D a_531_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1019 VGND a_1475_426# a_1449_133# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND CLK a_27_90# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1021 a_216_462# a_27_90# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1022 a_531_119# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_340_535# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1475_426# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.281e+11p pd=1.45e+06u as=0p ps=0u
-M1025 a_731_405# a_595_535# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Q a_1891_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_731_405# a_595_535# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1380_488# a_216_462# a_1255_449# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND a_1891_47# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR a_1255_449# a_1475_426# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_829_119# a_216_462# a_595_535# VNB nshort w=420000u l=150000u
-+  ad=9.66e+10p pd=1.3e+06u as=0p ps=0u
-M1032 a_1475_426# a_1255_449# a_1697_133# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1033 a_905_119# a_731_405# a_829_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR RESET_B a_340_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND a_1255_449# a_1891_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1036 VPWR CLK a_27_90# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1037 VPWR a_1891_47# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_1891_47# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 Q a_1891_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR RESET_B a_595_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_1449_133# a_1475_426# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 Q a_1891_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_829_119# a_731_405# a_905_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR RESET_B a_1475_426# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 Q a_1891_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND a_1891_47# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_1891_47# a_1255_449# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_27_90# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 Q a_1891_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VPWR a_1891_47# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_731_405# a_216_462# a_1255_449# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X14 a_1891_47# a_1255_449# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_595_535# a_27_90# a_689_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 VPWR a_595_535# a_731_405# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X17 a_27_90# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_595_535# a_216_462# a_829_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VPWR D a_340_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 VGND a_27_90# a_216_462# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 VGND RESET_B a_531_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_340_535# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X23 a_340_535# a_27_90# a_595_535# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VPWR a_1891_47# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 a_1475_426# a_1255_449# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X26 a_905_119# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_731_405# a_27_90# a_1255_449# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X28 a_1255_449# a_27_90# a_1449_133# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_1697_133# a_1255_449# a_1475_426# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_689_535# a_731_405# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X31 a_340_535# a_216_462# a_595_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X32 VPWR a_27_90# a_216_462# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X33 a_531_119# D a_340_535# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 VGND a_595_535# a_731_405# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X35 VGND RESET_B a_1697_133# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 a_1255_449# a_216_462# a_1380_488# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X37 a_1380_488# a_1475_426# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.cdl b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.cdl
index fa4c36c..59f31e6 100644
--- a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.cdl
+++ b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.cdl
@@ -16,72 +16,72 @@
 
 .SUBCKT sky130_fd_sc_lp__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 net130 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.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
-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 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 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.42 l=0.15 mult=1 sa=0.265
+MI36 net130 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 net98 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 net90 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 net113 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
-MI651 Q_N S0 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net142 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
-MI653 Q net142 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-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=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 net193 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
-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=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=0.64 l=0.15 mult=1 sa=0.265
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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 net170 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 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 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net98 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 net90 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 net157 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 net113 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.84 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
+MI652 net142 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
+MI653 Q net142 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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 net142 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
-MI660 Q net142 VPB phighvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net193 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
+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=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=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 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 net170 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 net157 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 net142 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
+MI660 Q net142 VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dfsbp_1
diff --git a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.netlist.tsv b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.netlist.tsv
index 2191fdb..9eba27e 100644
--- a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.netlist.tsv
+++ b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.netlist.tsv
@@ -1,36 +1,36 @@
 sky130_fd_sc_lp__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	net130	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.42	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	net113	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	S0	clkpos	net130	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net98	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	net90	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net90	S1	net98	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	net110	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net113	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net142	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net142	VGND	VNB	nshort	1	0.84	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	net193	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net193	M0	VPWR	VPB	phighvt	1	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	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	net170	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	net170	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net157	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	net157	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	net142	S0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net142	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	S0	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net130	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.42	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	net113	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	S0	clkpos	net130	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net98	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	net90	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net90	S1	net98	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	net110	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net113	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net142	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net142	VGND	VNB	nfet_01v8	1	0.84	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	net193	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net193	M0	VPWR	VPB	pfet_01v8_hvt	1	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	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	0.64	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	net170	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	net170	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net157	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	net157	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	net142	S0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net142	VPWR	VPB	pfet_01v8_hvt	1	1.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.spice b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.spice
index 4bf7fd8..5876ca0 100644
--- a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.spice
+++ b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_lp__dfsbp_1 CLK D SET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_666_119# a_161_21# a_580_119# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1001 Q_N a_1331_151# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=1.3183e+12p ps=1.229e+07u
-M1002 VPWR a_111_156# a_161_21# VPB phighvt w=640000u l=150000u
-+  ad=2.0156e+12p pd=1.701e+07u as=1.696e+11p ps=1.81e+06u
-M1003 a_580_119# a_161_21# a_494_119# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.176e+11p ps=1.4e+06u
-M1004 Q_N a_1331_151# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1005 VGND SET_B a_1657_71# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1006 VPWR a_1331_151# a_1535_177# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 a_1331_151# a_111_156# a_1259_449# VPB phighvt w=840000u l=150000u
-+  ad=3.801e+11p pd=3.8e+06u as=3.276e+11p ps=2.46e+06u
-M1008 a_494_119# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1009 VGND SET_B a_964_169# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1010 a_580_119# a_111_156# a_494_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_111_156# a_161_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1012 a_964_169# a_580_119# a_708_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1013 VPWR SET_B a_708_93# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1014 VPWR a_2005_119# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1015 a_1331_151# SET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1657_71# a_1535_177# a_1248_151# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.74e+06u
-M1017 a_2005_119# a_1331_151# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1018 a_494_119# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1331_151# a_111_156# a_1248_151# VNB nshort w=420000u l=150000u
-+  ad=2.286e+11p pd=2.07e+06u as=0p ps=0u
-M1020 a_1141_125# a_161_21# a_1331_151# VNB nshort w=640000u l=150000u
-+  ad=5.155e+11p pd=4.51e+06u as=0p ps=0u
-M1021 a_111_156# CLK VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1022 VGND a_2005_119# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1023 VGND a_708_93# a_666_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_1331_151# a_1535_177# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1025 a_111_156# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.281e+11p pd=1.45e+06u as=0p ps=0u
-M1026 a_1141_125# a_580_119# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_2005_119# a_1331_151# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1028 a_687_533# a_111_156# a_580_119# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1029 a_708_93# a_580_119# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR a_1535_177# a_1472_449# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.323e+11p ps=1.47e+06u
-M1031 VPWR a_708_93# a_687_533# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1259_449# a_580_119# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1472_449# a_161_21# a_1331_151# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_1331_151# a_2005_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR CLK a_111_156# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_494_119# a_111_156# a_580_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_1331_151# a_161_21# a_1141_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_1472_449# a_1535_177# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_1248_151# a_1535_177# a_1657_71# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND CLK a_111_156# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_1331_151# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 Q a_2005_119# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_1657_71# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 Q a_2005_119# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VPWR SET_B a_1331_151# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 VPWR D a_494_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 VGND a_1331_151# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_708_93# a_580_119# a_964_169# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_1331_151# a_161_21# a_1472_449# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 a_666_119# a_708_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VPWR a_580_119# a_708_93# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 a_1535_177# a_1331_151# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_580_119# a_111_156# a_687_533# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 a_687_533# a_708_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 VPWR a_1331_151# a_2005_119# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 a_161_21# a_111_156# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X23 a_494_119# a_161_21# a_580_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X24 a_1535_177# a_1331_151# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X25 VGND D a_494_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_1259_449# a_111_156# a_1331_151# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X27 a_580_119# a_161_21# a_666_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 VGND a_580_119# a_1141_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X29 a_1248_151# a_111_156# a_1331_151# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_708_93# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X31 VPWR a_580_119# a_1259_449# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X32 a_161_21# a_111_156# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 a_964_169# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.cdl b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.cdl
index e1b98f7..e2bc742 100644
--- a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.cdl
+++ b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.cdl
@@ -16,72 +16,72 @@
 
 .SUBCKT sky130_fd_sc_lp__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 net130 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.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
-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 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 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.42 l=0.15 mult=1 sa=0.265
+MI36 net130 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 net98 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 net90 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 net113 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
-MI651 Q_N S0 VNB nshort 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
-MI652 net142 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
-MI653 Q net142 VNB nshort 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
-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=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 net193 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
-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=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=0.64 l=0.15 mult=1 sa=0.265
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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 net170 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 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 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net98 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 net90 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 net157 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 net113 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=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
-MI24 S0 SET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI652 net142 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
+MI653 Q net142 VNB nfet_01v8 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
+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 net142 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
-MI660 Q net142 VPB phighvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net193 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
+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=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=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 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 net170 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 net157 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 net142 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
+MI660 Q net142 VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dfsbp_2
diff --git a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.netlist.tsv b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.netlist.tsv
index efe6b9a..66fe9a3 100644
--- a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.netlist.tsv
+++ b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.netlist.tsv
@@ -1,36 +1,36 @@
 sky130_fd_sc_lp__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	net130	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.42	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	net113	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	S0	clkpos	net130	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net98	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	net90	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net90	S1	net98	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	net110	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net113	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	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net142	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net142	VGND	VNB	nshort	2	0.84	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	net193	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net193	M0	VPWR	VPB	phighvt	1	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	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	net170	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	net170	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net157	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	net157	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	net142	S0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net142	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	S0	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net130	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.42	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	net113	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	S0	clkpos	net130	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net98	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	net90	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net90	S1	net98	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	net110	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net113	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	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net142	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net142	VGND	VNB	nfet_01v8	2	0.84	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	net193	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net193	M0	VPWR	VPB	pfet_01v8_hvt	1	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	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	0.64	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	net170	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	net170	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net157	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	net157	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	net142	S0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net142	VPWR	VPB	pfet_01v8_hvt	2	1.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.spice b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.spice
index 8ec912e..d7d8562 100644
--- a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.spice
+++ b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_lp__dfsbp_2 CLK D SET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_129_179# CLK VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=2.6113e+12p ps=2.327e+07u
-M1001 VPWR a_2227_367# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1002 a_129_179# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.9105e+12p ps=1.806e+07u
-M1003 a_1173_125# a_593_125# VGND VNB nshort w=640000u l=150000u
-+  ad=4.875e+11p pd=4.51e+06u as=0p ps=0u
-M1004 VPWR a_1360_451# Q_N VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1005 a_1360_451# SET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=3.906e+11p pd=3.83e+06u as=0p ps=0u
-M1006 VPWR a_129_179# a_191_21# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1007 VGND a_1360_451# a_1533_258# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1008 a_507_125# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1009 a_1360_451# a_129_179# a_1288_451# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=2.1e+06u
-M1010 a_1288_451# a_593_125# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1677_91# a_1533_258# a_1280_159# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.226e+11p ps=2.74e+06u
-M1012 Q a_2227_367# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1013 VPWR a_1533_258# a_1468_451# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.365e+11p ps=1.49e+06u
-M1014 VGND SET_B a_1677_91# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Q_N a_1360_451# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1016 Q a_2227_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR SET_B a_721_99# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=4.053e+11p ps=2.77e+06u
-M1018 a_2227_367# a_1360_451# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1019 a_721_99# a_593_125# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1360_451# a_129_179# a_1280_159# VNB nshort w=420000u l=150000u
-+  ad=2.158e+11p pd=2.03e+06u as=0p ps=0u
-M1021 a_679_125# a_191_21# a_593_125# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1022 VGND SET_B a_996_169# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1023 a_996_169# a_593_125# a_721_99# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1024 VPWR a_1360_451# a_1533_258# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1025 VGND a_721_99# a_679_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1173_125# a_191_21# a_1360_451# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_2227_367# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_701_535# a_129_179# a_593_125# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.344e+11p ps=1.48e+06u
-M1029 a_1468_451# a_191_21# a_1360_451# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND a_1360_451# Q_N VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_721_99# a_701_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_507_125# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1033 a_593_125# a_129_179# a_507_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_2227_367# a_1360_451# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1035 Q_N a_1360_451# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND a_129_179# a_191_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1037 a_593_125# a_191_21# a_507_125# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_2227_367# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_1677_91# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_721_99# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_507_125# a_129_179# a_593_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_1533_258# a_1360_451# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_679_125# a_721_99# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 Q_N a_1360_451# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_1533_258# a_1360_451# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND a_1360_451# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VPWR a_593_125# a_721_99# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_191_21# a_129_179# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_721_99# a_593_125# a_996_169# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 Q_N a_1360_451# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VPWR SET_B a_1360_451# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 Q a_2227_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_1360_451# a_191_21# a_1468_451# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 a_1468_451# a_1533_258# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 VGND a_1360_451# a_2227_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_1280_159# a_1533_258# a_1677_91# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VPWR a_593_125# a_1288_451# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X20 VGND CLK a_129_179# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 VPWR a_1360_451# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 a_1280_159# a_129_179# a_1360_451# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_191_21# a_129_179# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X24 VGND a_593_125# a_1173_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X25 a_996_169# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VGND a_2227_367# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 a_593_125# a_129_179# a_701_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 a_701_535# a_721_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X29 VPWR a_1360_451# a_2227_367# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X30 Q a_2227_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X31 a_507_125# a_191_21# a_593_125# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X32 a_1288_451# a_129_179# a_1360_451# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X33 VPWR D a_507_125# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X34 VGND D a_507_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 a_593_125# a_191_21# a_679_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 a_1360_451# a_191_21# a_1173_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X37 VPWR CLK a_129_179# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.cdl b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.cdl
index 7cab115..4c01276 100644
--- a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.cdl
+++ b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.cdl
@@ -16,86 +16,86 @@
 
 .SUBCKT sky130_fd_sc_lp__dfsbp_lp 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 net161 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
-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.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
-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 net141 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.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.42 l=0.15 mult=1 sa=0.265
+MI36 net161 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
-MI25 net129 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
-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 net121 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
-MI53 net117 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
-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 net144 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI651 Q_N S0 VNB nshort 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
-MI652 net173 S0 VNB nshort 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
-MI653 Q net173 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI52 net89 net173 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI654 net141 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
-MI51 net85 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
-MI50 net81 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
-MI49 net77 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
-MI48 net73 CLK VNB nshort m=1 w=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 net69 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI34 S0 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
-MI40 db D 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
-MI38 S0 clkneg VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net129 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 net121 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
+MI53 net117 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 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
-MI37 net224 M0 VPB phighvt m=1 w=1 l=0.25 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 net144 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.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=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI652 net173 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
+MI653 Q net173 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI52 net89 net173 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI51 net85 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI45 clkneg CLK VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI50 net81 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
-MI47 clkpos clkneg VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI49 net77 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
-MI659 M1 SET_B VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI48 net73 CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI41 net69 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
+MI40 db D 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
-MI662 net201 M1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI38 S0 clkneg 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
+MI37 net224 M0 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
+MI43 db clkpos 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
+MI45 clkneg CLK 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
+MI47 clkpos clkneg 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
+MI659 M1 SET_B 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
+MI662 net201 M1 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
+MI664 M0 clkneg 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
+MI6 net188 S1 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
+MI5 S0 clkpos 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
+MI24 S0 SET_B 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
+MI648 S1 S0 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
-MI664 M0 clkneg VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI658 M1 M0 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
-MI6 net188 S1 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
-MI5 S0 clkpos 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
-MI24 S0 SET_B 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
-MI648 S1 S0 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
-MI658 M1 M0 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
-MI663 net173 S0 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
-MI660 Q net173 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
-MI661 Q_N S0 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI663 net173 S0 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
+MI660 Q net173 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
+MI661 Q_N S0 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_lp__dfsbp_lp
diff --git a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.netlist.tsv b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.netlist.tsv
index 9cf2bd9..ff446fd 100644
--- a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.netlist.tsv
+++ b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.netlist.tsv
@@ -1,43 +1,43 @@
 sky130_fd_sc_lp__dfsbp_lp	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	net161	M0	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
-MI44	MOSFET	clkneg	CLK	net73	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	net77	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net144	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net141	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	net161	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	net69	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net129	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	net121	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net121	S1	net129	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI53	MOSFET	net117	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	net117	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net141	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net144	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	net81	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net173	S0	net85	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net173	net89	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI52	MOSFET	net89	net173	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI51	MOSFET	net85	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI50	MOSFET	net81	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	net77	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI48	MOSFET	net73	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	net69	clkneg	VGND	VNB	nshort	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	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net224	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net224	M0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net201	M1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net201	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net188	S1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	S0	clkpos	net188	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net173	S0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net173	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	S0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net161	M0	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
+MI44	MOSFET	clkneg	CLK	net73	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	net77	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net144	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net141	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	net161	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	net69	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net129	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	net121	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net121	S1	net129	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI53	MOSFET	net117	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	net117	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net141	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net144	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	net81	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net173	S0	net85	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net173	net89	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI52	MOSFET	net89	net173	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI51	MOSFET	net85	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI50	MOSFET	net81	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	net77	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI48	MOSFET	net73	CLK	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	net69	clkneg	VGND	VNB	nfet_01v8	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	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net224	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net224	M0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net201	M1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net201	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net188	S1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	S0	clkpos	net188	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net173	S0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net173	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	S0	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/dfsbp/sky130_fd_sc_lp__dfsbp_lp.spice b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.spice
index 7d3e7ca..f26070c 100644
--- a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.spice
+++ b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.spice
@@ -16,86 +16,45 @@
 
 
 .subckt sky130_fd_sc_lp__dfsbp_lp CLK D SET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_1621_125# a_263_409# a_1519_125# VNB nshort w=420000u l=150000u
-+  ad=1.88125e+11p pd=2.08e+06u as=1.512e+11p ps=1.56e+06u
-M1001 VPWR CLK a_263_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.9303e+12p pd=1.996e+07u as=2.85e+11p ps=2.57e+06u
-M1002 a_145_409# D VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=5.7e+11p pd=5.14e+06u as=0p ps=0u
-M1003 a_946_99# a_712_419# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1004 VPWR a_1519_125# a_2383_57# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1005 a_712_419# a_476_409# a_145_409# VPB phighvt w=1e+06u l=250000u
-+  ad=6.1e+11p pd=3.22e+06u as=0p ps=0u
-M1006 a_2042_57# a_1519_125# a_1686_40# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1007 VPWR a_1519_125# a_1686_40# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1008 VGND a_946_99# a_904_125# VNB nshort w=420000u l=150000u
-+  ad=9.726e+11p pd=1.069e+07u as=8.82e+10p ps=1.26e+06u
-M1009 a_1519_125# a_476_409# a_1441_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1010 a_145_409# D a_110_57# VNB nshort w=420000u l=150000u
-+  ad=2.226e+11p pd=2.74e+06u as=8.82e+10p ps=1.26e+06u
-M1011 a_2200_57# a_1519_125# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1012 Q_N a_1519_125# a_2200_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1013 a_1519_125# SET_B VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=9.3e+11p pd=5.86e+06u as=0p ps=0u
-M1014 Q_N a_1519_125# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1015 a_1719_419# a_476_409# a_1519_125# VPB phighvt w=1e+06u l=250000u
-+  ad=2.9e+11p pd=2.58e+06u as=0p ps=0u
-M1016 a_884_419# a_263_409# a_712_419# VPB phighvt w=1e+06u l=250000u
-+  ad=3.4e+11p pd=2.68e+06u as=0p ps=0u
-M1017 a_904_125# a_476_409# a_712_419# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.16e+11p ps=2.01e+06u
-M1018 a_1441_419# a_712_419# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1019 a_110_57# D VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_712_419# a_263_409# a_145_409# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_476_409# a_263_409# a_531_113# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1022 VGND SET_B a_1249_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1023 a_2470_57# a_1519_125# a_2383_57# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1024 VGND CLK a_373_113# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1025 VGND a_1519_125# a_2470_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_476_409# a_263_409# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1027 VPWR SET_B a_946_99# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_531_113# a_263_409# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1441_125# a_712_419# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Q a_2383_57# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1031 Q a_2383_57# a_2628_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1032 VPWR a_946_99# a_884_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR a_1686_40# a_1719_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1249_125# a_712_419# a_946_99# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1035 VGND a_1519_125# a_2042_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_373_113# CLK a_263_409# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1037 VGND SET_B a_1716_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1038 a_1519_125# a_263_409# a_1441_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_1716_66# a_1686_40# a_1621_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_2628_57# a_2383_57# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_904_125# a_946_99# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_1441_419# a_263_409# a_1519_125# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_531_113# a_263_409# a_476_409# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_2628_57# a_2383_57# Q VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_263_409# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_1519_125# a_263_409# a_1621_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_1621_125# a_1686_40# a_1716_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_712_419# a_946_99# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 VPWR D a_145_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 VPWR a_712_419# a_1441_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 a_712_419# a_476_409# a_904_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_2383_57# a_1519_125# a_2470_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_2200_57# a_1519_125# Q_N VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_1249_125# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_2383_57# a_1519_125# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X15 a_1686_40# a_1519_125# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X16 a_373_113# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_884_419# a_946_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X18 VGND a_712_419# a_1441_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_1686_40# a_1519_125# a_2042_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VPWR a_263_409# a_476_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X21 a_263_409# CLK a_373_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_946_99# a_712_419# a_1249_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_145_409# a_476_409# a_712_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X24 a_2042_57# a_1519_125# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 VGND a_2383_57# a_2628_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VPWR SET_B a_1519_125# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X27 VGND a_1519_125# a_2200_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_946_99# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X29 VGND a_263_409# a_531_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 VPWR a_1519_125# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X31 a_145_409# a_263_409# a_712_419# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 a_1441_125# a_476_409# a_1519_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 a_1716_66# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_1719_419# a_1686_40# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X35 VPWR a_2383_57# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X36 a_712_419# a_263_409# a_884_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X37 a_2470_57# a_1519_125# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 a_1519_125# a_476_409# a_1719_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X39 a_110_57# D a_145_409# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X40 VGND D a_110_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_1.cdl b/cells/dfstp/sky130_fd_sc_lp__dfstp_1.cdl
index 477f5ee..56a654c 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_1.cdl
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_lp__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.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
-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.42 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.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 net128 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-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=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 net179 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
-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=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=0.64 l=0.15 mult=1 sa=0.265
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net88 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ 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.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 net128 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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.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 net128 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net179 M0 VPB pfet_01v8_hvt m=1 w=0.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=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=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 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.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 net128 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dfstp_1
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_1.netlist.tsv b/cells/dfstp/sky130_fd_sc_lp__dfstp_1.netlist.tsv
index b1260f6..e201d8d 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_1.netlist.tsv
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_lp__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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net128	VGND	VNB	nshort	1	0.84	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	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net179	M0	VPWR	VPB	phighvt	1	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net128	VPWR	VPB	phighvt	1	1.26	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net128	VGND	VNB	nfet_01v8	1	0.84	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	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net179	M0	VPWR	VPB	pfet_01v8_hvt	1	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	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	0.64	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_1.spice b/cells/dfstp/sky130_fd_sc_lp__dfstp_1.spice
index 59b7309..779a7c7 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_1.spice
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_lp__dfstp_1 CLK D SET_B VGND VNB VPB VPWR Q
-M1000 Q a_1832_131# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=1.2149e+12p ps=1.126e+07u
-M1001 a_486_119# a_202_463# a_400_119# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.176e+11p ps=1.4e+06u
-M1002 VPWR a_1329_65# a_1092_417# VPB phighvt w=420000u l=150000u
-+  ad=1.4619e+12p pd=1.374e+07u as=2.226e+11p ps=2.74e+06u
-M1003 a_614_93# a_486_119# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1004 a_985_379# a_33_463# a_1175_417# VPB phighvt w=840000u l=150000u
-+  ad=5.625e+11p pd=4.91e+06u as=3.801e+11p ps=3.8e+06u
-M1005 a_400_119# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1006 Q a_1832_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1007 a_985_379# a_486_119# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND SET_B a_1359_91# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1009 a_400_119# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1329_65# a_1175_417# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1011 VGND a_1175_417# a_1832_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1012 VPWR CLK a_33_463# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1013 a_1175_417# a_202_463# a_1092_417# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1287_91# a_33_463# a_1175_417# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.158e+11p ps=2.03e+06u
-M1015 a_1359_91# a_1329_65# a_1287_91# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND SET_B a_853_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1017 VGND CLK a_33_463# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1018 a_202_463# a_33_463# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1019 a_1329_65# a_1175_417# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1020 a_582_463# a_33_463# a_486_119# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1021 a_1175_417# SET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_614_93# a_572_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1023 VPWR a_614_93# a_582_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_202_463# a_33_463# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1025 VPWR SET_B a_614_93# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_1175_417# a_1832_131# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1027 a_853_47# a_486_119# a_614_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1028 a_486_119# a_33_463# a_400_119# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1029 a_1110_47# a_486_119# VGND VNB nshort w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1030 a_572_119# a_202_463# a_486_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1175_417# a_202_463# a_1110_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_614_93# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VGND a_33_463# a_202_463# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_486_119# a_614_93# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VPWR a_1175_417# a_1329_65# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VPWR SET_B a_1175_417# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VGND D a_400_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_486_119# a_202_463# a_572_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_486_119# a_33_463# a_582_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_582_463# a_614_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_1832_131# a_1175_417# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_614_93# a_486_119# a_853_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_1287_91# a_1329_65# a_1359_91# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_1175_417# a_33_463# a_985_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X13 VPWR a_1832_131# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_853_47# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_1832_131# a_1175_417# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X16 a_1092_417# a_202_463# a_1175_417# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 VPWR a_486_119# a_985_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X18 a_1110_47# a_202_463# a_1175_417# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 a_1175_417# a_33_463# a_1287_91# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_1359_91# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_33_463# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 a_33_463# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VGND a_1175_417# a_1329_65# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VPWR a_33_463# a_202_463# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X25 a_1092_417# a_1329_65# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X26 a_400_119# a_33_463# a_486_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 VGND a_486_119# a_1110_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X28 VGND a_1832_131# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 VPWR D a_400_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X30 a_400_119# a_202_463# a_486_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X31 a_572_119# a_614_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_2.cdl b/cells/dfstp/sky130_fd_sc_lp__dfstp_2.cdl
index 67880fd..afd453f 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_2.cdl
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_2.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_lp__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.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
-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.42 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.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 net128 VNB nshort 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
-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=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 net179 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
-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=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=0.64 l=0.15 mult=1 sa=0.265
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net88 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ 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.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 net128 VNB nfet_01v8 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
+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.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 net128 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net179 M0 VPB pfet_01v8_hvt m=1 w=0.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=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=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 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.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 net128 VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dfstp_2
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_2.netlist.tsv b/cells/dfstp/sky130_fd_sc_lp__dfstp_2.netlist.tsv
index b344382..583faf3 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_2.netlist.tsv
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_2.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_lp__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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net128	VGND	VNB	nshort	2	0.84	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	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net179	M0	VPWR	VPB	phighvt	1	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net128	VPWR	VPB	phighvt	2	1.26	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net128	VGND	VNB	nfet_01v8	2	0.84	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	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net179	M0	VPWR	VPB	pfet_01v8_hvt	1	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	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	0.64	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_2.spice b/cells/dfstp/sky130_fd_sc_lp__dfstp_2.spice
index ead5425..7ef0053 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_2.spice
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_2.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_lp__dfstp_2 CLK D SET_B VGND VNB VPB VPWR Q
-M1000 a_988_379# a_486_119# VPWR VPB phighvt w=840000u l=150000u
-+  ad=5.2945e+11p pd=4.87e+06u as=1.7658e+12p ps=1.677e+07u
-M1001 a_1339_91# a_1309_65# a_1267_91# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=8.82e+10p ps=1.26e+06u
-M1002 a_486_119# a_196_465# a_400_119# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.176e+11p ps=1.4e+06u
-M1003 a_614_93# a_486_119# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1004 a_1309_65# a_1158_47# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1005 VPWR a_1158_47# a_1855_47# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1006 a_400_119# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.3716e+12p ps=1.307e+07u
-M1007 VGND CLK a_27_465# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1008 VPWR a_1309_65# a_1095_425# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.74e+06u
-M1009 VPWR CLK a_27_465# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1010 VGND SET_B a_857_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1011 a_400_119# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Q a_1855_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1013 VGND SET_B a_1339_91# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1158_47# a_196_465# a_1095_425# VPB phighvt w=420000u l=150000u
-+  ad=3.969e+11p pd=3.84e+06u as=0p ps=0u
-M1015 a_196_465# a_27_465# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1016 Q a_1855_47# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1017 a_1309_65# a_1158_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1018 VGND a_1158_47# a_1855_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1019 a_572_463# a_27_465# a_486_119# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1020 a_857_47# a_486_119# a_614_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1021 VGND a_614_93# a_572_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1022 VPWR a_1855_47# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR a_614_93# a_572_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_196_465# a_27_465# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.76e+11p pd=1.83e+06u as=0p ps=0u
-M1025 VPWR SET_B a_614_93# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_988_379# a_27_465# a_1158_47# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1086_47# a_486_119# VGND VNB nshort w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1028 VGND a_1855_47# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_486_119# a_27_465# a_400_119# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1030 a_1158_47# a_196_465# a_1086_47# VNB nshort w=640000u l=150000u
-+  ad=2.286e+11p pd=2.07e+06u as=0p ps=0u
-M1031 a_572_119# a_196_465# a_486_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1267_91# a_27_465# a_1158_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1158_47# SET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_27_465# a_196_465# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_614_93# a_486_119# a_857_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND D a_400_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_1855_47# a_1158_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_400_119# a_196_465# a_486_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_486_119# a_196_465# a_572_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_857_47# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 Q a_1855_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VPWR D a_400_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VPWR a_486_119# a_614_93# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_614_93# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_27_465# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_1086_47# a_196_465# a_1158_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 a_486_119# a_27_465# a_572_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 a_572_463# a_614_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 VPWR SET_B a_1158_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 Q a_1855_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_1339_91# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VGND a_1158_47# a_1309_65# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VGND a_1855_47# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 a_1095_425# a_1309_65# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 VPWR a_1158_47# a_1309_65# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 a_1855_47# a_1158_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X23 a_1267_91# a_1309_65# a_1339_91# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_1158_47# a_27_465# a_988_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X25 VGND a_486_119# a_1086_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X26 VPWR a_486_119# a_988_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X27 a_1095_425# a_196_465# a_1158_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 VPWR a_27_465# a_196_465# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X29 a_400_119# a_27_465# a_486_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_1158_47# a_27_465# a_1267_91# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_572_119# a_614_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 VPWR a_1855_47# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X33 a_27_465# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_4.cdl b/cells/dfstp/sky130_fd_sc_lp__dfstp_4.cdl
index 3ef572f..98dd253 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_4.cdl
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_4.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_lp__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 net121 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.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
-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 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
-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.42 l=0.15 mult=1 sa=0.265
+MI36 net121 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 net89 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 net81 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 net104 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 net129 S0 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net129 VNB nshort m=4 w=0.84 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=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 net180 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
-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=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=0.64 l=0.15 mult=1 sa=0.265
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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 net157 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 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
+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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net89 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 net81 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 net144 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 net104 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 net129 S0 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net129 VNB nfet_01v8 m=4 w=0.84 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 net129 S0 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net129 VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 S0 clkneg VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI37 net180 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
+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=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=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 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 net157 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 net144 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 net129 S0 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net129 VPB pfet_01v8_hvt m=4 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dfstp_4
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_4.netlist.tsv b/cells/dfstp/sky130_fd_sc_lp__dfstp_4.netlist.tsv
index 40a68f2..bf7dabb 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_4.netlist.tsv
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_4.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_lp__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	net121	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.42	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	net104	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
-MI34	MOSFET	S0	clkpos	net121	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net89	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	net81	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net81	S1	net89	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	net101	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net104	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net129	S0	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net129	VGND	VNB	nshort	4	0.84	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	net180	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net180	M0	VPWR	VPB	phighvt	1	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	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	net157	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	net157	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net144	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	net144	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	net129	S0	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net129	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net121	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.42	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	net104	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
+MI34	MOSFET	S0	clkpos	net121	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net89	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	net81	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net81	S1	net89	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	net101	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net104	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	net129	S0	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net129	VGND	VNB	nfet_01v8	4	0.84	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	net180	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net180	M0	VPWR	VPB	pfet_01v8_hvt	1	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	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	0.64	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	net157	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	net157	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net144	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	net144	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	net129	S0	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net129	VPWR	VPB	pfet_01v8_hvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_4.spice b/cells/dfstp/sky130_fd_sc_lp__dfstp_4.spice
index da91bf1..f1296a8 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_4.spice
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_4.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_lp__dfstp_4 CLK D SET_B VGND VNB VPB VPWR Q
-M1000 a_690_463# a_30_99# a_562_119# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1001 a_230_465# a_30_99# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.8475e+12p ps=1.655e+07u
-M1002 a_562_119# a_30_99# a_476_119# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.176e+11p ps=1.4e+06u
-M1003 VPWR SET_B a_690_93# VPB phighvt w=420000u l=150000u
-+  ad=2.05945e+12p pd=1.957e+07u as=1.176e+11p ps=1.4e+06u
-M1004 Q a_1989_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1005 VPWR CLK a_30_99# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1006 VPWR a_690_93# a_690_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_914_47# a_562_119# a_690_93# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1008 a_1428_91# a_1398_65# a_1356_91# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=8.82e+10p ps=1.26e+06u
-M1009 VGND SET_B a_914_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_1989_49# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1011 VPWR a_1247_47# a_1989_49# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1012 VGND a_1247_47# a_1989_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1013 VGND CLK a_30_99# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1014 VPWR a_1398_65# a_1201_407# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.74e+06u
-M1015 a_1175_47# a_562_119# VGND VNB nshort w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1016 a_690_93# a_562_119# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_1989_49# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1247_47# a_230_465# a_1175_47# VNB nshort w=640000u l=150000u
-+  ad=2.242e+11p pd=2.07e+06u as=0p ps=0u
-M1019 a_562_119# a_230_465# a_476_119# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1020 a_1094_379# a_562_119# VPWR VPB phighvt w=840000u l=150000u
-+  ad=5.825e+11p pd=5.07e+06u as=0p ps=0u
-M1021 a_1356_91# a_30_99# a_1247_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_1989_49# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Q a_1989_49# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1398_65# a_1247_47# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1025 a_230_465# a_30_99# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1026 a_1094_379# a_30_99# a_1247_47# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=3.801e+11p ps=3.8e+06u
-M1027 a_648_119# a_230_465# a_562_119# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1028 a_1398_65# a_1247_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1029 VGND a_1989_49# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Q a_1989_49# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_476_119# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1247_47# SET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Q a_1989_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND SET_B a_1428_91# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND a_690_93# a_648_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1247_47# a_230_465# a_1201_407# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_476_119# D VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_562_119# a_690_93# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_562_119# a_30_99# a_690_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_690_463# a_690_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_30_99# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_648_119# a_690_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_1247_47# a_30_99# a_1356_91# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_30_99# a_230_465# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 VGND D a_476_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_1356_91# a_1398_65# a_1428_91# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR a_562_119# a_1094_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 a_562_119# a_230_465# a_648_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_1247_47# a_30_99# a_1094_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X12 VPWR a_1247_47# a_1398_65# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 a_1989_49# a_1247_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 Q a_1989_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 Q a_1989_49# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_1201_407# a_1398_65# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 VPWR a_1989_49# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 a_1989_49# a_1247_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_476_119# a_30_99# a_562_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_914_47# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_1175_47# a_230_465# a_1247_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 VGND a_1989_49# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 VPWR D a_476_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X24 Q a_1989_49# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 a_1428_91# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VGND a_1989_49# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 VPWR SET_B a_1247_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 Q a_1989_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 VGND a_1247_47# a_1398_65# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_1201_407# a_230_465# a_1247_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X31 VGND a_30_99# a_230_465# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 a_476_119# a_230_465# a_562_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X33 a_690_93# a_562_119# a_914_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 VGND a_562_119# a_1175_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X35 a_30_99# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X36 VPWR a_1989_49# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X37 a_690_93# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.cdl b/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.cdl
index a9a5079..f1be17f 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.cdl
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.cdl
@@ -16,80 +16,80 @@
 
 .SUBCKT sky130_fd_sc_lp__dfstp_lp 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 net149 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
-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.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
-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 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
-MI34 S0 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
-MI46 clkpos clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI36 net149 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
-MI25 net117 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
-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 net109 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
-MI53 net105 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
-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 net132 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net157 S0 VNB nshort 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
-MI653 Q net157 VNB nshort 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
-MI52 net81 net157 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI654 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
-MI51 net77 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
-MI49 net73 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
-MI48 net69 CLK VNB nshort m=1 w=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 net65 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI34 S0 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
-MI40 db D 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
-MI38 S0 clkneg VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net117 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 net109 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
+MI53 net105 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 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
-MI37 net208 M0 VPB phighvt m=1 w=1 l=0.25 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 net132 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 net157 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
+MI653 Q net157 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI52 net81 net157 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI51 net77 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
-MI43 db clkpos VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI49 net73 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
-MI45 clkneg CLK VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI48 net69 CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI41 net65 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
+MI40 db D 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
-MI47 clkpos clkneg VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI38 S0 clkneg 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
+MI37 net208 M0 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
+MI43 db clkpos 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
+MI45 clkneg CLK 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
+MI47 clkpos clkneg 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
+MI659 M1 SET_B 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
+MI662 net185 M1 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
+MI664 M0 clkneg 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
+MI6 net172 S1 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
+MI5 S0 clkpos 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
+MI24 S0 SET_B 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
+MI648 S1 S0 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
-MI659 M1 SET_B VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI658 M1 M0 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
-MI662 net185 M1 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
-MI664 M0 clkneg 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
-MI6 net172 S1 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
-MI5 S0 clkpos 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
-MI24 S0 SET_B 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
-MI648 S1 S0 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
-MI658 M1 M0 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
-MI663 net157 S0 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
-MI660 Q net157 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
+MI663 net157 S0 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
+MI660 Q net157 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_lp__dfstp_lp
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.netlist.tsv b/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.netlist.tsv
index b2abf83..7a355e0 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.netlist.tsv
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.netlist.tsv
@@ -1,40 +1,40 @@
 sky130_fd_sc_lp__dfstp_lp	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	net149	M0	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
-MI44	MOSFET	clkneg	CLK	net69	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	db	D	net73	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net132	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net129	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	net149	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	net65	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net117	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	net109	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net109	S1	net117	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI53	MOSFET	net105	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	net105	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net129	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net132	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net157	S0	net77	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net157	net81	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI52	MOSFET	net81	net157	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI51	MOSFET	net77	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	net73	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI48	MOSFET	net69	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	net65	clkneg	VGND	VNB	nshort	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	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net208	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net208	M0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net185	M1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net185	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net172	S1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	S0	clkpos	net172	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net157	S0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net157	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net149	M0	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
+MI44	MOSFET	clkneg	CLK	net69	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	db	D	net73	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net132	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net129	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	net149	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	net65	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net117	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	net109	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net109	S1	net117	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI53	MOSFET	net105	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	net105	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net129	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net132	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	net157	S0	net77	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net157	net81	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI52	MOSFET	net81	net157	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI51	MOSFET	net77	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	MOSFET	net73	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI48	MOSFET	net69	CLK	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	net65	clkneg	VGND	VNB	nfet_01v8	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	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net208	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net208	M0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net185	M1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net185	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net172	S1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	S0	clkpos	net172	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net157	S0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net157	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/dfstp/sky130_fd_sc_lp__dfstp_lp.spice b/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.spice
index 3bd5322..918bdbe 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.spice
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_lp__dfstp_lp CLK D SET_B VGND VNB VPB VPWR Q
-M1000 VPWR a_1731_99# a_1726_419# VPB phighvt w=1e+06u l=250000u
-+  ad=3.06e+12p pd=2.012e+07u as=2.9e+11p ps=2.58e+06u
-M1001 a_2374_74# a_1526_125# a_2287_74# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1002 a_1448_125# a_709_419# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=9.72e+11p ps=1.068e+07u
-M1003 VGND a_1526_125# a_2374_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Q a_2287_74# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1005 a_135_409# D VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=5.7e+11p pd=5.14e+06u as=0p ps=0u
-M1006 Q a_2287_74# a_2532_74# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1007 VGND SET_B a_1256_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1008 VGND a_943_321# a_904_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1009 a_1526_125# a_266_409# a_1448_419# VPB phighvt w=1e+06u l=250000u
-+  ad=9.35e+11p pd=5.87e+06u as=2.4e+11p ps=2.48e+06u
-M1010 a_135_409# D a_110_57# VNB nshort w=420000u l=150000u
-+  ad=2.226e+11p pd=2.74e+06u as=8.82e+10p ps=1.26e+06u
-M1011 a_479_409# a_266_409# a_531_109# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1012 a_943_321# a_709_419# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.95e+11p pd=2.59e+06u as=0p ps=0u
-M1013 VGND CLK a_373_109# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1014 a_531_109# a_266_409# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_2532_74# a_2287_74# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_1526_125# a_2287_74# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1017 a_904_125# a_479_409# a_709_419# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.701e+11p ps=1.65e+06u
-M1018 a_479_409# a_266_409# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1019 a_1256_125# a_709_419# a_943_321# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1020 a_1761_125# a_1731_99# a_1683_125# VNB nshort w=420000u l=150000u
-+  ad=2.121e+11p pd=1.85e+06u as=1.008e+11p ps=1.32e+06u
-M1021 a_709_419# a_479_409# a_135_409# VPB phighvt w=1e+06u l=250000u
-+  ad=6.1e+11p pd=3.22e+06u as=0p ps=0u
-M1022 a_110_57# D VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_373_109# CLK a_266_409# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1024 a_1726_419# a_479_409# a_1526_125# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR SET_B a_943_321# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_881_419# a_266_409# a_709_419# VPB phighvt w=1e+06u l=250000u
-+  ad=3.1e+11p pd=2.62e+06u as=0p ps=0u
-M1027 VPWR a_943_321# a_881_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_709_419# a_266_409# a_135_409# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR CLK a_266_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1030 a_1526_125# a_479_409# a_1448_125# VNB nshort w=420000u l=150000u
-+  ad=2.667e+11p pd=2.11e+06u as=0p ps=0u
-M1031 a_1448_419# a_709_419# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1683_125# a_266_409# a_1526_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1526_125# SET_B VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR a_1526_125# a_1731_99# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1035 a_2104_47# a_1526_125# a_1731_99# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1036 VGND SET_B a_1761_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND a_1526_125# a_2104_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_904_125# a_943_321# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_2287_74# a_1526_125# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_1256_125# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_1731_99# a_1526_125# a_2104_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_2374_74# a_1526_125# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_2287_74# a_2532_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_135_409# a_479_409# a_709_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_531_109# a_266_409# a_479_409# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_709_419# a_479_409# a_904_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND a_709_419# a_1448_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_1731_99# a_1526_125# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 a_2532_74# a_2287_74# Q VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_266_409# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X13 a_1526_125# a_266_409# a_1683_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VPWR a_709_419# a_943_321# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X15 VPWR D a_135_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X16 a_2287_74# a_1526_125# a_2374_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_1726_419# a_1731_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X18 a_135_409# a_266_409# a_709_419# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_1683_125# a_1731_99# a_1761_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VPWR a_709_419# a_1448_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X21 a_1761_125# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_1526_125# a_479_409# a_1726_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X23 a_373_109# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VPWR a_2287_74# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X25 a_1448_419# a_266_409# a_1526_125# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X26 VPWR SET_B a_1526_125# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X27 a_709_419# a_266_409# a_881_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X28 a_2104_47# a_1526_125# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 VPWR a_266_409# a_479_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X30 a_266_409# CLK a_373_109# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_881_419# a_943_321# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X32 VGND a_266_409# a_531_109# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 a_943_321# a_709_419# a_1256_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_943_321# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X35 a_110_57# D a_135_409# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 VGND D a_110_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 a_1448_125# a_479_409# a_1526_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.cdl b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.cdl
index 10a7725..c124615 100644
--- a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.cdl
+++ b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_lp__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 net72 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net116 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
-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 net48 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
-MI661 Q_N net116 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 M1 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
-MI649 S1 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
-MI635 clkneg CLK VNB nshort m=1 w=0.42 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.42 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.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
-MI660 Q_N net116 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MI656 net72 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=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI646 Q S1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-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
-MI647 net116 S1 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
-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 net119 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=0.64 l=0.15 mult=1 sa=0.265
+MI662 net116 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
-MI658 net100 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.26 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=0.64 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 net48 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
+MI661 Q_N net116 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 M1 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 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
+MI635 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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
+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
+MI660 Q_N net116 VPB pfet_01v8_hvt m=1 w=1.26 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
+MI647 net116 S1 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
+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 net119 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=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 net100 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.26 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=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_lp__dfxbp_1
diff --git a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.netlist.tsv b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.netlist.tsv
index 054de63..d89583d 100644
--- a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.netlist.tsv
+++ b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_lp__dfxbp_1	CLK:I D:I VGND:I VNB:I VPB:I VPWR:I Q:O Q_N:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI657	MOSFET	M0	clkpos	net72	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net72	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net116	S1	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
-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	net48	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net48	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net116	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M1	clkpos	S0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	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
-MI659	MOSFET	M0	clkneg	net100	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q_N	net116	VPWR	VPB	phighvt	1	1.26	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	net119	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	net116	S1	VPWR	VPB	phighvt	1	0.64	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	net119	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net100	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.26	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net72	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net72	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net116	S1	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
+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	net48	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net48	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net116	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	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
+MI659	MOSFET	M0	clkneg	net100	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	net116	VPWR	VPB	pfet_01v8_hvt	1	1.26	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	net119	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	net116	S1	VPWR	VPB	pfet_01v8_hvt	1	0.64	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	net119	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net100	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.26	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.spice b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.spice
index 6fbeaca..f1f2c37 100644
--- a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.spice
+++ b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_lp__dfxbp_1 CLK D VGND VNB VPB VPWR Q Q_N
-M1000 a_1105_119# a_110_82# a_997_119# VNB nshort w=420000u l=150000u
-+  ad=9.24e+10p pd=1.28e+06u as=1.638e+11p ps=1.62e+06u
-M1001 VPWR a_697_93# a_650_499# VPB phighvt w=420000u l=150000u
-+  ad=1.9091e+12p pd=1.627e+07u as=1.764e+11p ps=1.92e+06u
-M1002 VPWR a_110_82# a_217_463# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1003 VPWR a_1149_93# a_1137_379# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1004 a_110_82# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.537e+12p ps=1.318e+07u
-M1005 VGND a_697_93# a_655_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1006 a_1149_93# a_997_119# VGND VNB nshort w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1007 Q_N a_1401_22# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1008 VGND a_110_82# a_217_463# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1009 VGND a_1149_93# a_1105_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_526_463# a_110_82# a_440_463# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.176e+11p ps=1.4e+06u
-M1011 VGND a_1149_93# a_1401_22# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1012 Q_N a_1401_22# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1013 a_697_93# a_526_463# VPWR VPB phighvt w=840000u l=150000u
-+  ad=4.62e+11p pd=2.78e+06u as=0p ps=0u
-M1014 a_655_119# a_217_463# a_526_463# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Q a_1149_93# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1016 a_650_499# a_110_82# a_526_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.424e+11p ps=2.14e+06u
-M1017 Q a_1149_93# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1018 a_997_119# a_217_463# a_697_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.158e+11p ps=2.03e+06u
-M1019 a_1137_379# a_217_463# a_997_119# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.688e+11p ps=2.43e+06u
-M1020 a_1149_93# a_997_119# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1021 VPWR a_1149_93# a_1401_22# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1022 a_440_463# D VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_440_463# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1024 a_697_93# a_526_463# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_997_119# a_110_82# a_697_93# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_110_82# CLK VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1027 a_526_463# a_217_463# a_440_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_526_463# a_697_93# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 a_1401_22# a_1149_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_440_463# a_110_82# a_526_463# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_997_119# a_110_82# a_1105_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_440_463# a_217_463# a_526_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_1401_22# a_1149_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_650_499# a_697_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VPWR a_997_119# a_1149_93# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 a_697_93# a_217_463# a_997_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND D a_440_463# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND a_997_119# a_1149_93# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 VPWR CLK a_110_82# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 a_1137_379# a_1149_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 a_526_463# a_217_463# a_655_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_697_93# a_110_82# a_997_119# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X15 VPWR a_1401_22# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_1105_119# a_1149_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VPWR a_1149_93# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 a_217_463# a_110_82# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VGND a_1401_22# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 VPWR D a_440_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 a_655_119# a_697_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 VGND a_1149_93# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 VGND CLK a_110_82# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_526_463# a_110_82# a_650_499# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X25 a_217_463# a_110_82# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X26 VPWR a_526_463# a_697_93# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X27 a_997_119# a_217_463# a_1137_379# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.cdl b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.cdl
index bc135ae..83a1ae2 100644
--- a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.cdl
+++ b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_lp__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 net72 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net116 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
-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 net48 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
-MI661 Q_N net116 VNB nshort 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
-MI652 M1 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
-MI649 S1 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
-MI635 clkneg CLK VNB nshort m=1 w=0.42 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.42 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.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
-MI660 Q_N net116 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
+MI656 net72 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=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI646 Q S1 VNB nfet_01v8 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
-MI647 net116 S1 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
-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 net119 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=0.64 l=0.15 mult=1 sa=0.265
+MI662 net116 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
-MI658 net100 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.26 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=0.64 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 net48 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
+MI661 Q_N net116 VNB nfet_01v8 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
+MI652 M1 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 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
+MI635 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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
+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
+MI660 Q_N net116 VPB pfet_01v8_hvt m=2 w=1.26 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
+MI647 net116 S1 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
+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 net119 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=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 net100 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.26 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=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_lp__dfxbp_2
diff --git a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.netlist.tsv b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.netlist.tsv
index 63395b1..3c0ee97 100644
--- a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.netlist.tsv
+++ b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_lp__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	net72	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net72	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net116	S1	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
-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	net48	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net48	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net116	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M1	clkpos	S0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	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
-MI659	MOSFET	M0	clkneg	net100	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q_N	net116	VPWR	VPB	phighvt	2	1.26	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	net119	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	net116	S1	VPWR	VPB	phighvt	1	0.64	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	net119	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net100	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.26	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net72	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net72	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net116	S1	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
+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	net48	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net48	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net116	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	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
+MI659	MOSFET	M0	clkneg	net100	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	net116	VPWR	VPB	pfet_01v8_hvt	2	1.26	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	net119	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	net116	S1	VPWR	VPB	pfet_01v8_hvt	1	0.64	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	net119	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net100	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.26	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.spice b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.spice
index 265e74b..500e694 100644
--- a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.spice
+++ b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_lp__dfxbp_2 CLK D VGND VNB VPB VPWR Q Q_N
-M1000 a_628_119# a_236_463# a_537_119# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.281e+11p ps=1.45e+06u
-M1001 a_537_119# a_110_70# a_429_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.638e+11p ps=1.62e+06u
-M1002 a_110_70# CLK VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=2.5364e+12p ps=1.955e+07u
-M1003 Q a_1169_93# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1004 VGND a_1169_93# a_1125_119# VNB nshort w=420000u l=150000u
-+  ad=2.0153e+12p pd=1.608e+07u as=9.24e+10p ps=1.28e+06u
-M1005 a_1169_93# a_982_369# VGND VNB nshort w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1006 VGND a_670_93# a_628_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_670_93# a_669_499# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=1.92e+06u
-M1008 a_110_70# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1009 a_670_93# a_537_119# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1010 VPWR a_1169_93# a_1157_453# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.526e+11p ps=1.58e+06u
-M1011 VPWR a_1513_137# Q_N VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1012 VPWR a_1169_93# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Q a_1169_93# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1014 VGND a_1169_93# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_110_70# a_236_463# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1016 a_537_119# a_236_463# a_429_119# VPB phighvt w=420000u l=150000u
-+  ad=2.424e+11p pd=2.14e+06u as=1.176e+11p ps=1.4e+06u
-M1017 a_669_499# a_110_70# a_537_119# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_1169_93# a_1513_137# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1019 a_1157_453# a_236_463# a_982_369# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=5.628e+11p ps=3.13e+06u
-M1020 Q_N a_1513_137# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1021 VPWR a_1169_93# a_1513_137# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1022 a_670_93# a_537_119# VGND VNB nshort w=640000u l=150000u
-+  ad=2.158e+11p pd=2.03e+06u as=0p ps=0u
-M1023 a_982_369# a_110_70# a_670_93# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_429_119# D VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_982_369# a_236_463# a_670_93# VNB nshort w=420000u l=150000u
-+  ad=1.974e+11p pd=1.78e+06u as=0p ps=0u
-M1026 a_1125_119# a_110_70# a_982_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_429_119# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND a_110_70# a_236_463# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1029 VGND a_1513_137# Q_N VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1169_93# a_982_369# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1031 Q_N a_1513_137# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_1513_137# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_537_119# a_110_70# a_669_499# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VGND CLK a_110_70# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_236_463# a_110_70# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 Q a_1169_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_670_93# a_236_463# a_982_369# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_1157_453# a_1169_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND a_1169_93# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_429_119# a_236_463# a_537_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 Q_N a_1513_137# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VGND a_537_119# a_670_93# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_537_119# a_236_463# a_628_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VPWR a_1169_93# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 VPWR a_537_119# a_670_93# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 a_982_369# a_236_463# a_1157_453# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 a_429_119# a_110_70# a_537_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_982_369# a_110_70# a_1125_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND a_982_369# a_1169_93# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 a_1513_137# a_1169_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 a_236_463# a_110_70# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VPWR a_982_369# a_1169_93# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X21 Q a_1169_93# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 a_1513_137# a_1169_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_670_93# a_110_70# a_982_369# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X24 a_628_119# a_670_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 VPWR CLK a_110_70# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X26 VGND D a_429_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 Q_N a_1513_137# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X28 a_669_499# a_670_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X29 VPWR a_1513_137# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 VPWR D a_429_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X31 a_1125_119# a_1169_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.cdl b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.cdl
index 5423baf..0949374 100644
--- a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.cdl
+++ b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.cdl
@@ -16,76 +16,76 @@
 
 .SUBCKT sky130_fd_sc_lp__dfxbp_lp 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 net134 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
-MI670 net130 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 net122 net178 VNB nshort m=1 w=0.42 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
-MI668 net118 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
-MI667 net114 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
-MI662 net178 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
-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
-MI666 net94 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
-MI641 net90 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
-MI661 Q_N net178 VNB nshort m=1 w=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 net78 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
-MI649 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
-MI635 clkneg CLK VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MI656 net134 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
-MI634 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
-MI664 net58 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI670 net130 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
-MI663 net54 CLK VNB nshort 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.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=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI669 net122 net178 VNB nfet_01v8 m=1 w=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 net118 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
+MI667 net114 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
+MI662 net178 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
+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
-MI660 Q_N net178 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=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
+MI666 net94 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
+MI641 net90 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
+MI661 Q_N net178 VNB nfet_01v8 m=1 w=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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 net78 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
-MI650 S1 S0 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI649 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
-MI644 S0 clkpos VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI635 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 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
-MI647 net178 S1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI664 net58 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
+MI663 net54 CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg 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
+MI660 Q_N net178 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
+MI650 S1 S0 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
-MI639 M1 M0 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI644 S0 clkpos 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
+MI647 net178 S1 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
+MI639 M1 M0 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
-MI643 net181 S1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI643 net181 S1 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
+MI638 clkneg CLK 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
+MI658 net162 M1 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
+MI645 Q S1 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
-MI638 clkneg CLK VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI651 db clkpos 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
+MI655 db D 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
-MI658 net162 M1 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
-MI645 Q S1 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
-MI651 db clkpos 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
-MI655 db D 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
-MI653 M1 clkneg 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
-MI637 clkpos clkneg VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265
+MI653 M1 clkneg 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
+MI637 clkpos clkneg 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_lp__dfxbp_lp
diff --git a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.netlist.tsv b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.netlist.tsv
index 4309269..9205a62 100644
--- a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.netlist.tsv
+++ b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.netlist.tsv
@@ -1,38 +1,38 @@
 sky130_fd_sc_lp__dfxbp_lp	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	net134	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net134	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net130	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	net118	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	net122	net178	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI668	MOSFET	net118	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI667	MOSFET	net114	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net178	S1	net130	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
-MI654	MOSFET	db	D	net78	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net90	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	net94	M0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net90	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net178	net122	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	net78	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	net114	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	net54	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	net58	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	net94	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	net58	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net54	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net162	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q_N	net178	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net181	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	net178	S1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net181	S1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net162	M1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	db	D	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net134	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net134	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net130	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	net118	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	net122	net178	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI668	MOSFET	net118	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI667	MOSFET	net114	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net178	S1	net130	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
+MI654	MOSFET	db	D	net78	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net90	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	net94	M0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net90	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net178	net122	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	net78	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	net114	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	net54	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	net58	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	net94	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	net58	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net54	CLK	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net162	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q_N	net178	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net181	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	net178	S1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net181	S1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net162	M1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	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/dfxbp/sky130_fd_sc_lp__dfxbp_lp.spice b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.spice
index 04eb1f3..767b4f9 100644
--- a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.spice
+++ b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_lp__dfxbp_lp CLK D VGND VNB VPB VPWR Q Q_N
-M1000 a_297_85# D VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=8.391e+11p ps=9.11e+06u
-M1001 Q_N a_2062_367# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=1.99e+12p ps=1.598e+07u
-M1002 a_239_403# D a_297_85# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1003 a_2168_127# a_1507_321# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 VPWR a_615_93# a_349_323# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=5.6e+11p ps=5.12e+06u
-M1005 a_1445_419# a_511_218# a_1339_153# VPB phighvt w=1e+06u l=250000u
-+  ad=3.1e+11p pd=2.62e+06u as=2.8e+11p ps=2.56e+06u
-M1006 VGND CLK a_125_85# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1007 VPWR a_1507_321# Q VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1008 a_239_403# a_511_218# a_455_85# VPB phighvt w=1e+06u l=250000u
-+  ad=5.65e+11p pd=5.13e+06u as=2.8e+11p ps=2.56e+06u
-M1009 VGND a_27_403# a_1049_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1010 VGND a_1507_321# a_1232_153# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.814e+11p ps=3.02e+06u
-M1011 a_2010_127# a_1507_321# Q VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1012 a_2062_367# a_1507_321# a_2168_127# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1013 VPWR CLK a_27_403# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1014 a_2062_367# a_1507_321# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1015 a_1507_321# a_1339_153# a_1742_57# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=8.82e+10p ps=1.26e+06u
-M1016 a_455_85# a_27_403# a_239_403# VNB nshort w=420000u l=150000u
-+  ad=2.341e+11p pd=2.06e+06u as=0p ps=0u
-M1017 VGND a_1507_321# a_2010_127# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_125_85# CLK a_27_403# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1019 VGND a_615_93# a_573_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1020 a_615_93# a_455_85# a_763_119# VNB nshort w=420000u l=150000u
-+  ad=2.373e+11p pd=2.81e+06u as=8.82e+10p ps=1.26e+06u
-M1021 VPWR a_1507_321# a_1445_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1339_153# a_27_403# a_1232_153# VNB nshort w=420000u l=150000u
-+  ad=1.9665e+11p pd=1.92e+06u as=0p ps=0u
-M1023 a_1339_153# a_27_403# a_615_93# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=5.7e+11p ps=5.14e+06u
-M1024 a_1742_57# a_1339_153# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Q_N a_2062_367# a_2436_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1026 a_455_85# a_27_403# a_349_323# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_615_93# a_455_85# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_239_403# D VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_573_119# a_511_218# a_455_85# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_763_119# a_455_85# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_615_93# a_511_218# a_1339_153# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_2436_57# a_2062_367# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR a_27_403# a_511_218# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1034 a_1049_125# a_27_403# a_511_218# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.736e+11p ps=1.71e+06u
-M1035 a_1507_321# a_1339_153# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
+X0 a_1445_419# a_1507_321# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 VPWR a_1507_321# a_2062_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 VGND a_1339_153# a_1742_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_2010_127# a_1507_321# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR a_455_85# a_615_93# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_1049_125# a_27_403# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_455_85# a_511_218# a_239_403# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 VPWR a_2062_367# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_1742_57# a_1339_153# a_1507_321# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_2168_127# a_1507_321# a_2062_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND D a_297_85# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_511_218# a_27_403# a_1049_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND a_2062_367# a_2436_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_349_323# a_615_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X14 a_349_323# a_27_403# a_455_85# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X15 a_2436_57# a_2062_367# Q_N VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_1339_153# a_511_218# a_1445_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X17 a_1232_153# a_27_403# a_1339_153# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 Q a_1507_321# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X19 a_27_403# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X20 VPWR a_1339_153# a_1507_321# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X21 Q a_1507_321# a_2010_127# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_763_119# a_455_85# a_615_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_1339_153# a_511_218# a_615_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_125_85# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_27_403# CLK a_125_85# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_615_93# a_27_403# a_1339_153# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X27 VGND a_455_85# a_763_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_573_119# a_615_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 VGND a_1507_321# a_2168_127# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 VPWR D a_239_403# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X31 a_511_218# a_27_403# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X32 a_297_85# D a_239_403# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 a_239_403# a_27_403# a_455_85# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_455_85# a_511_218# a_573_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 a_1232_153# a_1507_321# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.cdl b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.cdl
index a0e6220..a692aa4 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.cdl
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_lp__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 net72 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.84 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 net48 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.42 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.64 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.42 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.42 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.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
-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 net119 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=0.64 l=0.15 mult=1 sa=0.265
+MI656 net72 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 net100 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.84 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.26 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=0.64 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 net48 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.42 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.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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
+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 net119 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=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 net100 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.26 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=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_lp__dfxtp_1
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.netlist.tsv b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.netlist.tsv
index b0447c7..2b749cf 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.netlist.tsv
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_lp__dfxtp_1	CLK:I D:I VGND:I VNB:I VPB:I VPWR:I Q:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI657	MOSFET	M0	clkpos	net72	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net72	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.84	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	net48	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net48	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	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
-MI659	MOSFET	M0	clkneg	net100	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	net119	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	net119	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net100	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.26	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net72	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net72	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.84	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	net48	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net48	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	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
+MI659	MOSFET	M0	clkneg	net100	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	net119	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	net119	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net100	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.26	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.spice b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.spice
index 1b56a61..afc8842 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.spice
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_lp__dfxtp_1 CLK D VGND VNB VPB VPWR Q
-M1000 a_668_137# a_526_413# VPWR VPB phighvt w=840000u l=150000u
-+  ad=3.024e+11p pd=2.4e+06u as=1.4301e+12p ps=1.252e+07u
-M1001 a_957_379# a_110_70# a_668_137# VPB phighvt w=840000u l=150000u
-+  ad=4.956e+11p pd=2.97e+06u as=0p ps=0u
-M1002 a_110_70# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.2167e+12p ps=1.022e+07u
-M1003 a_1116_379# a_217_413# a_957_379# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 a_526_413# a_217_413# a_440_413# VPB phighvt w=420000u l=150000u
-+  ad=2.31e+11p pd=1.94e+06u as=1.176e+11p ps=1.4e+06u
-M1005 a_668_137# a_526_413# VGND VNB nshort w=640000u l=150000u
-+  ad=2.011e+11p pd=1.96e+06u as=0p ps=0u
-M1006 VPWR a_1158_93# a_1116_379# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Q a_1158_93# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1008 VGND a_668_137# a_626_163# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1009 a_957_379# a_217_413# a_668_137# VNB nshort w=420000u l=150000u
-+  ad=2.268e+11p pd=1.92e+06u as=0p ps=0u
-M1010 a_1158_93# a_957_379# VGND VNB nshort w=640000u l=150000u
-+  ad=2.048e+11p pd=1.92e+06u as=0p ps=0u
-M1011 VGND a_110_70# a_217_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1012 VPWR a_110_70# a_217_413# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1013 VGND a_1158_93# a_1116_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1014 a_1158_93# a_957_379# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1015 Q a_1158_93# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1016 a_626_163# a_217_413# a_526_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1017 a_1116_119# a_110_70# a_957_379# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_440_413# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1019 a_666_413# a_110_70# a_526_413# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1020 a_526_413# a_110_70# a_440_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_110_70# CLK VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1022 VPWR a_668_137# a_666_413# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_440_413# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND CLK a_110_70# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_440_413# a_110_70# a_526_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_668_137# a_110_70# a_957_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 VPWR D a_440_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_626_163# a_668_137# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_957_379# a_1158_93# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 VPWR CLK a_110_70# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 a_217_413# a_110_70# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_1116_119# a_1158_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_526_413# a_217_413# a_626_163# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_217_413# a_110_70# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 a_526_413# a_110_70# a_666_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 a_957_379# a_110_70# a_1116_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_666_413# a_668_137# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 VGND a_1158_93# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VPWR a_957_379# a_1158_93# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 VGND a_526_413# a_668_137# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 a_440_413# a_217_413# a_526_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 a_957_379# a_217_413# a_1116_379# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 a_1116_379# a_1158_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 VPWR a_1158_93# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 a_668_137# a_217_413# a_957_379# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 VPWR a_526_413# a_668_137# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X23 VGND D a_440_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.cdl b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.cdl
index 99a0e2a..b42d49f 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.cdl
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_lp__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 net72 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.84 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 net48 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.42 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.64 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.42 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.42 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.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
-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 net119 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=0.64 l=0.15 mult=1 sa=0.265
+MI656 net72 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 net100 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.84 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.26 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=0.64 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 net48 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.42 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.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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
+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 net119 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=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 net100 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.26 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=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_lp__dfxtp_2
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.netlist.tsv b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.netlist.tsv
index 7933c6f..de7a454 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.netlist.tsv
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_lp__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	net72	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net72	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.84	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	net48	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net48	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	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
-MI659	MOSFET	M0	clkneg	net100	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	net119	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	net119	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net100	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.26	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net72	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net72	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.84	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	net48	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net48	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	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
+MI659	MOSFET	M0	clkneg	net100	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	net119	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	net119	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net100	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.26	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.spice b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.spice
index 449963c..8df05b6 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.spice
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_lp__dfxtp_2 CLK D VGND VNB VPB VPWR Q
-M1000 a_679_93# a_551_119# VGND VNB nshort w=640000u l=150000u
-+  ad=2.158e+11p pd=2.03e+06u as=1.4114e+12p ps=1.258e+07u
-M1001 VGND a_1175_93# a_1133_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1002 a_705_443# a_110_62# a_551_119# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.31e+11p ps=1.94e+06u
-M1003 a_1175_93# a_1004_379# VGND VNB nshort w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1004 a_637_119# a_240_443# a_551_119# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1005 VPWR a_679_93# a_705_443# VPB phighvt w=420000u l=150000u
-+  ad=1.8245e+12p pd=1.576e+07u as=0p ps=0u
-M1006 a_1133_119# a_110_62# a_1004_379# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=1.68e+06u
-M1007 a_1175_93# a_1004_379# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1008 Q a_1175_93# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1009 VGND a_110_62# a_240_443# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1010 a_432_119# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1011 a_679_93# a_551_119# VPWR VPB phighvt w=840000u l=150000u
-+  ad=3.024e+11p pd=2.4e+06u as=0p ps=0u
-M1012 a_432_119# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.869e+11p pd=1.73e+06u as=0p ps=0u
-M1013 VPWR a_110_62# a_240_443# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1014 a_1004_379# a_110_62# a_679_93# VPB phighvt w=840000u l=150000u
-+  ad=4.956e+11p pd=2.97e+06u as=0p ps=0u
-M1015 a_551_119# a_110_62# a_432_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Q a_1175_93# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1017 a_1163_379# a_240_443# a_1004_379# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1018 a_1004_379# a_240_443# a_679_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_1175_93# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_1175_93# a_1163_379# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_110_62# CLK VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1022 a_551_119# a_240_443# a_432_119# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_110_62# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1024 VGND a_679_93# a_637_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_1175_93# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_679_93# a_110_62# a_1004_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 a_637_119# a_679_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_1175_93# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_1004_379# a_240_443# a_1163_379# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_1163_379# a_1175_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VGND a_551_119# a_679_93# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_1004_379# a_110_62# a_1133_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR D a_432_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VGND D a_432_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR CLK a_110_62# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X10 a_240_443# a_110_62# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 Q a_1175_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VGND CLK a_110_62# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_679_93# a_240_443# a_1004_379# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_432_119# a_240_443# a_551_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 a_1133_119# a_1175_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VGND a_1004_379# a_1175_93# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 a_551_119# a_240_443# a_637_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_551_119# a_110_62# a_705_443# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 a_705_443# a_679_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 VPWR a_551_119# a_679_93# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X21 VGND a_1175_93# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 Q a_1175_93# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_240_443# a_110_62# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VPWR a_1004_379# a_1175_93# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X25 a_432_119# a_110_62# a_551_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.cdl b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.cdl
index df517b4..0b81bbb 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.cdl
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_lp__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 net72 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.84 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 net48 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.42 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.84 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.42 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.42 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.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
-MI650 S1 S0 VPB phighvt m=1 w=1.26 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 net119 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=0.64 l=0.15 mult=1 sa=0.265
+MI656 net72 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 net100 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.84 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.26 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=0.64 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 net48 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.42 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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
+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.26 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 net119 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=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 net100 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.26 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=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_lp__dfxtp_4
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.netlist.tsv b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.netlist.tsv
index 91c839b..76fd444 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.netlist.tsv
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_lp__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	net72	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net72	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.84	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	net48	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net48	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	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
-MI659	MOSFET	M0	clkneg	net100	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net119	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	net119	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net100	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.26	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net72	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net72	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.84	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	net48	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net48	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	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
+MI659	MOSFET	M0	clkneg	net100	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net119	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	net119	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net100	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.26	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.spice b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.spice
index 6d493e1..7ad25e3 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.spice
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.spice
@@ -16,64 +16,34 @@
 
 
 .subckt sky130_fd_sc_lp__dfxtp_4 CLK D VGND VNB VPB VPWR Q
-M1000 a_526_413# a_110_70# a_431_119# VNB nshort w=420000u l=150000u
-+  ad=1.575e+11p pd=1.59e+06u as=1.596e+11p ps=1.6e+06u
-M1001 VGND a_684_93# a_642_119# VNB nshort w=420000u l=150000u
-+  ad=1.5787e+12p pd=1.465e+07u as=8.82e+10p ps=1.26e+06u
-M1002 VPWR a_1112_93# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.2113e+12p pd=1.945e+07u as=7.056e+11p ps=6.16e+06u
-M1003 a_684_93# a_526_413# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1004 a_110_70# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1005 a_642_119# a_217_413# a_526_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_1116_441# a_217_413# a_941_379# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=5.06225e+11p ps=3.13e+06u
-M1007 a_941_379# a_217_413# a_684_93# VNB nshort w=420000u l=150000u
-+  ad=1.491e+11p pd=1.55e+06u as=2.239e+11p ps=2.07e+06u
-M1008 a_526_413# a_217_413# a_431_119# VPB phighvt w=420000u l=150000u
-+  ad=2.31e+11p pd=1.94e+06u as=1.176e+11p ps=1.4e+06u
-M1009 Q a_1112_93# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_1112_93# a_1070_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1011 VGND a_110_70# a_217_413# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1012 VPWR a_1112_93# a_1116_441# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Q a_1112_93# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1014 Q a_1112_93# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_110_70# a_217_413# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1016 a_684_93# a_526_413# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1070_119# a_110_70# a_941_379# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Q a_1112_93# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_431_119# D VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_1112_93# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_941_379# a_110_70# a_684_93# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_666_413# a_110_70# a_526_413# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1023 a_110_70# CLK VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1024 VPWR a_684_93# a_666_413# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_1112_93# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1112_93# a_941_379# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1027 a_431_119# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1112_93# a_941_379# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1029 VGND a_1112_93# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND CLK a_110_70# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_941_379# a_110_70# a_1070_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND a_941_379# a_1112_93# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VPWR a_1112_93# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_684_93# a_110_70# a_941_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X5 VGND a_1112_93# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_526_413# a_217_413# a_642_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_941_379# a_1112_93# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR D a_431_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VGND D a_431_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VPWR CLK a_110_70# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 VGND a_526_413# a_684_93# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 Q a_1112_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_431_119# a_110_70# a_526_413# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_941_379# a_217_413# a_1116_441# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 a_1116_441# a_1112_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 Q a_1112_93# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_217_413# a_110_70# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 VGND a_1112_93# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 Q a_1112_93# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 a_526_413# a_110_70# a_666_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 a_217_413# a_110_70# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_642_119# a_684_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_666_413# a_684_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X24 a_431_119# a_217_413# a_526_413# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X25 a_1070_119# a_1112_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 Q a_1112_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 a_684_93# a_217_413# a_941_379# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 VPWR a_526_413# a_684_93# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X29 VPWR a_1112_93# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.cdl b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.cdl
index 7fbd2a0..a269f75 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.cdl
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.cdl
@@ -16,64 +16,64 @@
 
 .SUBCKT sky130_fd_sc_lp__dfxtp_lp 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 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
-MI646 Q 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
-MI668 net100 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
-MI667 net96 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
-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
-MI666 net80 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
-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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 net68 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
-MI649 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
-MI635 clkneg CLK VNB nshort m=1 w=0.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 net48 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 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
-MI663 net44 CLK VNB nshort 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.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=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI668 net100 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
+MI667 net96 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
+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
-MI650 S1 S0 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=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
+MI666 net80 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
+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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI665 net68 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
-MI644 S0 clkpos VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI649 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
-MI639 M1 M0 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI635 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 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
-MI643 net151 S1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI664 net48 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
+MI663 net44 CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI659 M0 clkneg 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
+MI650 S1 S0 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
-MI638 clkneg CLK VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI644 S0 clkpos 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
+MI639 M1 M0 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
-MI658 net136 M1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI643 net151 S1 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
+MI638 clkneg CLK 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
+MI658 net136 M1 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
+MI645 Q S1 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
-MI645 Q S1 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
-MI651 db clkpos VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI651 db clkpos 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
+MI655 db D 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
-MI655 db D 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
-MI653 M1 clkneg 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
-MI637 clkpos clkneg VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265
+MI653 M1 clkneg 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
+MI637 clkpos clkneg 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_lp__dfxtp_lp
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.netlist.tsv b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.netlist.tsv
index 2763996..9a716aa 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.netlist.tsv
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.netlist.tsv
@@ -1,32 +1,32 @@
 sky130_fd_sc_lp__dfxtp_lp	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	net108	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net108	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	net100	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI668	MOSFET	net100	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI667	MOSFET	net96	S0	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
-MI654	MOSFET	db	D	net68	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
-MI666	MOSFET	net80	M0	VGND	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	net68	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	net96	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	net44	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	net48	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	net80	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	net48	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net44	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net136	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net151	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	M1	M0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	net151	S1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net136	M1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	db	D	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	M0	clkpos	net108	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net108	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	net100	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI668	MOSFET	net100	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI667	MOSFET	net96	S0	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
+MI654	MOSFET	db	D	net68	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
+MI666	MOSFET	net80	M0	VGND	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	net68	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	net96	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkneg	CLK	net44	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	net48	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	net80	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	net48	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net44	CLK	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net136	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net151	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	net151	S1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net136	M1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	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/dfxtp/sky130_fd_sc_lp__dfxtp_lp.spice b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.spice
index bcab519..7cced9d 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.spice
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.spice
@@ -16,64 +16,34 @@
 
 
 .subckt sky130_fd_sc_lp__dfxtp_lp CLK D VGND VNB VPB VPWR Q
-M1000 a_263_409# a_27_57# a_270_57# VNB nshort w=420000u l=150000u
-+  ad=1.155e+11p pd=1.39e+06u as=8.82e+10p ps=1.26e+06u
-M1001 a_1626_75# a_27_57# a_1429_383# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.026e+11p ps=2.15e+06u
-M1002 VGND a_1583_285# a_1626_75# VNB nshort w=420000u l=150000u
-+  ad=1.154e+12p pd=9.85e+06u as=0p ps=0u
-M1003 VPWR CLK a_27_57# VPB phighvt w=1e+06u l=250000u
-+  ad=2.67e+12p pd=1.534e+07u as=2.85e+11p ps=2.57e+06u
-M1004 a_629_125# D a_543_125# VNB nshort w=420000u l=150000u
-+  ad=2.515e+11p pd=2.18e+06u as=1.176e+11p ps=1.4e+06u
-M1005 VPWR a_1583_285# a_1535_383# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1006 a_1429_383# a_263_409# a_1005_99# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.218e+11p ps=1.42e+06u
-M1007 a_962_371# a_27_57# a_747_79# VPB phighvt w=1e+06u l=250000u
-+  ad=3.5125e+11p pd=2.95e+06u as=4.835e+11p ps=3.18e+06u
-M1008 a_1429_383# a_27_57# a_1005_99# VPB phighvt w=1e+06u l=250000u
-+  ad=2.8e+11p pd=2.56e+06u as=5.009e+11p ps=3.3e+06u
-M1009 a_2054_92# a_1583_285# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1010 a_747_79# a_263_409# a_629_125# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=6.9645e+11p ps=3.4e+06u
-M1011 a_543_125# D VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_1784_75# a_1429_383# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1013 a_747_79# a_27_57# a_629_125# VNB nshort w=420000u l=150000u
-+  ad=2.625e+11p pd=2.55e+06u as=0p ps=0u
-M1014 a_1583_285# a_1429_383# a_1784_75# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1015 a_1005_99# a_747_79# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_1005_99# a_962_371# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1583_285# a_1429_383# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=3.65e+11p pd=2.73e+06u as=0p ps=0u
-M1018 a_1005_99# a_747_79# a_1355_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1019 a_263_409# a_27_57# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1020 VGND CLK a_112_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1021 a_1355_125# a_747_79# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_629_125# D VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1535_383# a_263_409# a_1429_383# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_902_125# a_263_409# a_747_79# VNB nshort w=420000u l=150000u
-+  ad=2.163e+11p pd=1.87e+06u as=0p ps=0u
-M1025 Q a_1583_285# a_2054_92# VNB nshort w=420000u l=150000u
-+  ad=1.155e+11p pd=1.39e+06u as=0p ps=0u
-M1026 a_112_57# CLK a_27_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1027 Q a_1583_285# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1028 a_270_57# a_27_57# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND a_1005_99# a_902_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_629_125# a_263_409# a_747_79# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_270_57# a_27_57# a_263_409# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_1429_383# a_1583_285# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_1626_75# a_1583_285# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_1429_383# a_1784_75# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_747_79# a_1355_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_27_57# a_263_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_902_125# a_1005_99# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND a_1583_285# a_2054_92# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_112_57# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_27_57# CLK a_112_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND a_27_57# a_270_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_2054_92# a_1583_285# Q VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VPWR D a_629_125# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X14 VPWR a_747_79# a_1005_99# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X15 a_27_57# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X16 a_1429_383# a_263_409# a_1535_383# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X17 a_1005_99# a_263_409# a_1429_383# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_1429_383# a_27_57# a_1626_75# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_747_79# a_263_409# a_902_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_1355_125# a_747_79# a_1005_99# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_1535_383# a_1583_285# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X22 a_1005_99# a_27_57# a_1429_383# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X23 VGND D a_543_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_629_125# a_27_57# a_747_79# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_962_371# a_1005_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X26 a_747_79# a_27_57# a_962_371# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X27 a_1784_75# a_1429_383# a_1583_285# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_543_125# D a_629_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 VPWR a_1583_285# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.cdl b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.cdl
index a4e9603..a8fba1a 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.cdl
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_lp__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.64 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.64 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.26 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=0.64 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=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=0.64 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.64 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.26 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.84 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI659 net63 CLK 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 clkpos CLK VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI658 net63 m1 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
+MI19 m1 M0 VPB pfet_01v8_hvt m=1 w=1.26 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=0.64 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=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=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 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 GCLK net63 VPB pfet_01v8_hvt m=1 w=1.26 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.84 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.84 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 GCLK net63 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlclkp_1
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.netlist.tsv b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.netlist.tsv
index 289d8b1..4af6f84 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.netlist.tsv
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_lp__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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net63	m1	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	M0	clkneg	net54	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net54	GATE	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net63	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	VGND	VNB	nshort	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net99	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net63	m1	net99	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net91	GATE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	GCLK	net63	VGND	VNB	nshort	1	0.84	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.64	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	M0	clkneg	net54	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net54	GATE	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	0.64	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net99	CLK	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net63	m1	net99	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net91	GATE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	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	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	GCLK	net63	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.spice b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.spice
index 33f27ec..5522e96 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.spice
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__dlclkp_1 CLK GATE VGND VNB VPB VPWR GCLK
-M1000 a_80_269# a_315_382# a_273_480# VPB phighvt w=640000u l=150000u
-+  ad=2.221e+11p pd=2.06e+06u as=1.344e+11p ps=1.7e+06u
-M1001 VPWR a_27_367# a_453_480# VPB phighvt w=420000u l=150000u
-+  ad=2.04465e+12p pd=1.399e+07u as=8.82e+10p ps=1.26e+06u
-M1002 a_279_81# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.07688e+12p ps=9.44e+06u
-M1003 a_315_382# a_321_55# VPWR VPB phighvt w=640000u l=150000u
-+  ad=2.752e+11p pd=2.14e+06u as=0p ps=0u
-M1004 VGND a_27_367# a_437_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1005 a_1046_367# a_27_367# a_1002_79# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1006 a_1046_367# CLK VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1007 a_1002_79# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_80_269# a_27_367# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1009 a_453_480# a_321_55# a_80_269# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_437_81# a_315_382# a_80_269# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1011 VPWR CLK a_321_55# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.464e+11p ps=2.05e+06u
-M1012 a_315_382# a_321_55# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1013 VGND CLK a_321_55# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1014 GCLK a_1046_367# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1015 GCLK a_1046_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1016 a_80_269# a_321_55# a_279_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_27_367# a_1046_367# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_273_480# GATE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_80_269# a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 VPWR a_1046_367# GCLK VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_453_480# a_27_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VGND GATE a_279_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR CLK a_1046_367# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 a_437_81# a_27_367# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_321_55# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 a_27_367# a_80_269# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_27_367# a_80_269# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_1046_367# a_27_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 VGND CLK a_1002_79# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_279_81# a_321_55# a_80_269# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND a_321_55# a_315_382# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_80_269# a_321_55# a_453_480# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 a_321_55# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VPWR a_321_55# a_315_382# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X15 a_1002_79# a_27_367# a_1046_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VPWR GATE a_273_480# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X17 a_273_480# a_315_382# a_80_269# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 a_80_269# a_315_382# a_437_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VGND a_1046_367# GCLK VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.cdl b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.cdl
index 50f23eb..9db656c 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.cdl
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_lp__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=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 net63 m1 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
-MI19 m1 M0 VPB phighvt m=1 w=1.26 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=0.64 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=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=0.64 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.64 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.26 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.84 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI659 net63 CLK 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 clkpos CLK VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI658 net63 m1 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
+MI19 m1 M0 VPB pfet_01v8_hvt m=1 w=1.26 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=0.64 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=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=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 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 GCLK net63 VPB pfet_01v8_hvt m=2 w=1.26 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.84 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.84 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 GCLK net63 VNB nfet_01v8 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_lp__dlclkp_2
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.netlist.tsv b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.netlist.tsv
index 9936f3b..0b5d920 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.netlist.tsv
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_lp__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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net63	m1	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	M0	clkneg	net54	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net54	GATE	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net63	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	VGND	VNB	nshort	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net99	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net63	m1	net99	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net91	GATE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	GCLK	net63	VGND	VNB	nshort	2	0.84	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.64	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	M0	clkneg	net54	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net54	GATE	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	0.64	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net99	CLK	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net63	m1	net99	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net91	GATE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	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	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	GCLK	net63	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.spice b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.spice
index e4db4bd..a21745a 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.spice
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_lp__dlclkp_2 CLK GATE VGND VNB VPB VPWR GCLK
-M1000 a_1039_367# CLK VPWR VPB phighvt w=640000u l=150000u
-+  ad=2.4e+11p pd=2.03e+06u as=2.1189e+12p ps=1.6e+07u
-M1001 a_284_367# a_300_55# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1002 a_1039_367# a_33_47# a_1002_133# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1003 VGND a_1039_367# GCLK VNB nshort w=840000u l=150000u
-+  ad=1.30157e+12p pd=1.166e+07u as=2.352e+11p ps=2.24e+06u
-M1004 a_78_269# a_284_367# a_242_465# VPB phighvt w=640000u l=150000u
-+  ad=2.221e+11p pd=2.06e+06u as=1.344e+11p ps=1.7e+06u
-M1005 VGND a_78_269# a_33_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.25e+06u
-M1006 a_1002_133# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND CLK a_300_55# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.68e+11p ps=1.64e+06u
-M1008 VPWR CLK a_300_55# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.227e+11p ps=2.54e+06u
-M1009 VPWR a_78_269# a_33_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1010 VPWR a_1039_367# GCLK VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1011 a_242_465# GATE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_422_465# a_300_55# a_78_269# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1013 VGND a_33_47# a_416_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1014 VPWR a_33_47# a_422_465# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_78_269# a_300_55# a_258_81# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=8.82e+10p ps=1.26e+06u
-M1016 VPWR a_33_47# a_1039_367# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 GCLK a_1039_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 GCLK a_1039_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_284_367# a_300_55# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1020 a_258_81# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_416_81# a_284_367# a_78_269# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_1039_367# GCLK VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 GCLK a_1039_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_33_47# a_78_269# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_258_81# a_300_55# a_78_269# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_1039_367# a_33_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 GCLK a_1039_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_416_81# a_33_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_300_55# a_284_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_78_269# a_300_55# a_422_465# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_300_55# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_422_465# a_33_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_242_465# a_284_367# a_78_269# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 VPWR CLK a_1039_367# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 VGND CLK a_1002_133# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_33_47# a_78_269# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VGND GATE a_258_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_78_269# a_284_367# a_416_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_300_55# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 a_1002_133# a_33_47# a_1039_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VGND a_1039_367# GCLK VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 VPWR GATE a_242_465# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X21 VPWR a_300_55# a_284_367# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.cdl b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.cdl
index 2e71a27..3c0a844 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.cdl
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 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.26 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.26 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=0.64 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=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=0.64 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.64 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.26 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.84 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.42 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.84 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.84 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI659 net63 CLK VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI658 net63 m1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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=0.64 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=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=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 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 GCLK net63 VPB pfet_01v8_hvt m=4 w=1.26 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.84 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.84 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.42 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.84 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.84 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 GCLK net63 VNB nfet_01v8 m=4 w=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_lp__dlclkp_4
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.netlist.tsv b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.netlist.tsv
index cda34b7..84cc0aa 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.netlist.tsv
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net63	m1	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	M0	clkneg	net54	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net54	GATE	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net63	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	VGND	VNB	nshort	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net99	CLK	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net63	m1	net99	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net91	GATE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	GCLK	net63	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	M0	clkneg	net54	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net54	GATE	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	0.64	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net99	CLK	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net63	m1	net99	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net91	GATE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	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	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	GCLK	net63	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.spice b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.spice
index 545931b..472324c 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.spice
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_lp__dlclkp_4 CLK GATE VGND VNB VPB VPWR GCLK
-M1000 a_1078_367# CLK VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=2.7749e+12p ps=1.959e+07u
-M1001 a_73_269# a_295_55# a_253_81# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=8.82e+10p ps=1.26e+06u
-M1002 a_1078_367# a_27_367# a_1026_47# VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=1.764e+11p ps=2.1e+06u
-M1003 VPWR a_1078_367# GCLK VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1004 GCLK a_1078_367# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=1.46918e+12p ps=1.352e+07u
-M1005 a_1026_47# CLK VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_235_465# GATE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1007 a_415_465# a_295_55# a_73_269# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.221e+11p ps=2.06e+06u
-M1008 a_277_367# a_295_55# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1009 a_253_81# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_27_367# a_411_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1011 VPWR a_27_367# a_415_465# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR CLK a_295_55# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.7485e+11p ps=2.21e+06u
-M1013 VGND a_1078_367# GCLK VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_411_81# a_277_367# a_73_269# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_1078_367# GCLK VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 GCLK a_1078_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_27_367# a_1078_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 GCLK a_1078_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 GCLK a_1078_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_73_269# a_277_367# a_235_465# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_277_367# a_295_55# VPWR VPB phighvt w=640000u l=150000u
-+  ad=2.25e+11p pd=2.03e+06u as=0p ps=0u
-M1022 VGND a_73_269# a_27_367# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1023 VPWR a_1078_367# GCLK VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND CLK a_295_55# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.999e+11p ps=1.86e+06u
-M1025 VPWR a_73_269# a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 a_411_81# a_27_367# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_295_55# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND GATE a_253_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_253_81# a_295_55# a_73_269# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR GATE a_235_465# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_73_269# a_277_367# a_411_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_27_367# a_73_269# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 GCLK a_1078_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND a_1078_367# GCLK VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VPWR a_1078_367# GCLK VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 GCLK a_1078_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VGND a_1078_367# GCLK VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VPWR CLK a_1078_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 VGND CLK a_1026_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 GCLK a_1078_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_73_269# a_295_55# a_415_465# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 a_415_465# a_27_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 VPWR a_295_55# a_277_367# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 a_27_367# a_73_269# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 GCLK a_1078_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 a_1078_367# a_27_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 VGND a_295_55# a_277_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_235_465# a_277_367# a_73_269# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X23 a_295_55# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X24 a_1026_47# a_27_367# a_1078_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 VPWR a_1078_367# GCLK VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.cdl b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.cdl
index 22f0f18..d9d31aa 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.cdl
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_lp__dlclkp_lp CLK GATE VGND VNB VPB VPWR GCLK
 *.PININFO CLK:I GATE:I VGND:I VNB:I VPB:I VPWR:I GCLK:O
-MI662 net79 m1 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
-MI664 M0 clkpos 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
-MI659 net67 CLK 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
-MI658 net67 m1 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
-MI19 m1 M0 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
-MI38 M0 clkneg 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
-MI37 net58 GATE 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
-MI47 clkneg clkpos 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
-MI45 clkpos CLK 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
-MI660 GCLK net67 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
-MI20 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
-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 net130 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net119 CLK VNB nshort m=1 w=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 net67 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 net111 GATE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI662 net79 m1 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
-MI44 clkpos CLK VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 GCLK net67 VNB nshort m=1 w=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 net95 net67 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 net91 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
-MI22 net87 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI664 M0 clkpos 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
-MI21 net83 CLK VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI659 net67 CLK 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
+MI658 net67 m1 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
+MI19 m1 M0 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
+MI38 M0 clkneg 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
+MI37 net58 GATE 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
+MI47 clkneg clkpos 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
+MI45 clkpos CLK 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
+MI660 GCLK net67 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
+MI20 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
+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 net130 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net119 CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net67 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 net111 GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 GCLK net67 VNB nfet_01v8 m=1 w=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 net95 net67 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 net91 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
+MI22 net87 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
+MI21 net83 CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlclkp_lp
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.netlist.tsv b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.netlist.tsv
index a69a86e..65812f3 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.netlist.tsv
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_lp__dlclkp_lp	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	net79	m1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkpos	net79	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net67	CLK	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net67	m1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	M0	clkneg	net58	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net58	GATE	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net67	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	net91	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkneg	net130	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net130	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	net111	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net119	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net67	m1	net119	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net111	GATE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkneg	clkpos	net87	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK	net83	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	GCLK	net67	net95	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	net95	net67	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net91	M0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net87	clkpos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net83	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net79	m1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkpos	net79	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net67	CLK	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net67	m1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	M0	clkneg	net58	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net58	GATE	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	GCLK	net67	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	net91	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkneg	net130	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net130	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	net111	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net119	CLK	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net67	m1	net119	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net111	GATE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	net87	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK	net83	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	GCLK	net67	net95	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	net95	net67	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net91	M0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net87	clkpos	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net83	CLK	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/dlclkp/sky130_fd_sc_lp__dlclkp_lp.spice b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.spice
index 3dc8fc9..1ac1dc5 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.spice
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_lp__dlclkp_lp CLK GATE VGND VNB VPB VPWR GCLK
-M1000 VGND a_80_21# a_110_47# VNB nshort w=420000u l=150000u
-+  ad=5.061e+11p pd=5.77e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VPWR a_584_21# a_526_419# VPB phighvt w=1e+06u l=250000u
-+  ad=1.235e+12p pd=1.047e+07u as=3.2e+11p ps=2.64e+06u
-M1002 a_1284_47# a_1147_419# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1003 VPWR a_80_21# a_27_47# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1004 VPWR a_584_21# a_1147_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1005 a_1147_419# a_584_21# a_1104_185# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.008e+11p ps=1.32e+06u
-M1006 GCLK a_1147_419# a_1284_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1007 a_254_419# GATE VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1008 a_1147_419# CLK VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_284_47# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1010 a_352_419# a_80_21# a_284_47# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1011 VGND a_584_21# a_448_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.856e+11p ps=2.2e+06u
-M1012 a_526_419# a_80_21# a_352_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=6.2e+11p ps=3.24e+06u
-M1013 a_110_47# a_80_21# a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1014 VGND CLK a_923_185# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.365e+11p ps=1.49e+06u
-M1015 a_584_21# a_352_419# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1016 a_923_185# CLK a_80_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1017 a_1104_185# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_352_419# a_27_47# a_254_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_700_47# a_352_419# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1020 VPWR CLK a_80_21# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1021 GCLK a_1147_419# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1022 a_448_47# a_27_47# a_352_419# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_584_21# a_352_419# a_700_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
+X0 a_1147_419# a_584_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_352_419# a_80_21# a_526_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_80_21# CLK a_923_185# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR GATE a_254_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_110_47# a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_352_419# a_27_47# a_448_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_27_47# a_80_21# a_110_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_1284_47# a_1147_419# GCLK VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND GATE a_284_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_254_419# a_27_47# a_352_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 a_80_21# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 VGND a_1147_419# a_1284_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND CLK a_1104_185# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_27_47# a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X14 a_526_419# a_584_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X15 VPWR a_1147_419# GCLK VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X16 a_700_47# a_352_419# a_584_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_448_47# a_584_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_923_185# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VGND a_352_419# a_700_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VPWR CLK a_1147_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X21 a_1104_185# a_584_21# a_1147_419# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_284_47# a_80_21# a_352_419# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VPWR a_352_419# a_584_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.cdl b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.cdl
index da5e8d2..b792784 100644
--- a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.cdl
+++ b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_lp__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.64 l=0.15 mult=1 sa=0.265
+MI635 clkneg 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
+MI648 Q_N net79 VPB pfet_01v8_hvt m=1 w=1.26 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 net79 VPB phighvt m=1 w=1.26 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 net79 m1 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
-MI650 Q m1 VPB phighvt m=1 w=1.26 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.64 l=0.15 mult=1 sa=0.265
+MI17 M0 clkneg 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 m1 RESET_B VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MI646 net79 m1 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
-MI18 net51 db 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
-MI653 net59 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.26 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.64 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.42 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=1 w=1.26 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 net79 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 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
-MI657 net86 RESET_B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N 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 m1 RESET_B VPB pfet_01v8_hvt m=1 w=1.26 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=1 w=0.84 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.42 l=0.15 mult=1 sa=0.265
+MI18 net51 db 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 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 net59 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net79 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI645 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
+MI657 net86 RESET_B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net98 db VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net98 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlrbn_1
diff --git a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.netlist.tsv b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.netlist.tsv
index 2d78aeb..9a982b6 100644
--- a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.netlist.tsv
+++ b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_lp__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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net79	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net79	m1	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	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	net59	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net79	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net79	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net86	RESET_B	VGND	VNB	nshort	1	0.84	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	net86	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nshort	1	0.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net79	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net79	m1	VPWR	VPB	pfet_01v8_hvt	1	0.64	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.26	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	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	net59	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.26	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.64	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net79	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net79	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net86	RESET_B	VGND	VNB	nfet_01v8	1	0.84	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	net86	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	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/dlrbn/sky130_fd_sc_lp__dlrbn_1.spice b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.spice
index efaa420..5e3299e 100644
--- a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.spice
+++ b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_lp__dlrbn_1 D GATE_N RESET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_630_167# a_112_70# a_625_377# VPB phighvt w=420000u l=150000u
-+  ad=2.158e+11p pd=2.03e+06u as=2.226e+11p ps=2.74e+06u
-M1001 VGND a_112_70# a_207_40# VNB nshort w=420000u l=150000u
-+  ad=1.1613e+12p pd=9.82e+06u as=1.113e+11p ps=1.37e+06u
-M1002 VGND a_1394_367# Q_N VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1003 VPWR RESET_B a_955_271# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7548e+12p pd=1.539e+07u as=3.528e+11p ps=3.08e+06u
-M1004 a_625_377# a_955_271# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_112_70# a_207_40# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1006 Q a_955_271# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1007 a_716_167# a_207_40# a_630_167# VNB nshort w=420000u l=150000u
-+  ad=2.226e+11p pd=2.74e+06u as=1.176e+11p ps=1.4e+06u
-M1008 a_1211_47# a_630_167# a_955_271# VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=2.226e+11p ps=2.21e+06u
-M1009 a_112_70# GATE_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1010 VGND RESET_B a_1211_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_112_70# GATE_N VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1012 a_955_271# a_630_167# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_813_377# a_207_40# a_630_167# VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1014 Q a_955_271# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1015 VPWR a_437_144# a_813_377# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_630_167# a_112_70# a_547_167# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.74e+06u
-M1017 a_437_144# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1018 a_437_144# D VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1019 VGND a_437_144# a_547_167# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1394_367# a_955_271# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1021 a_716_167# a_955_271# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_1394_367# Q_N VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1023 a_1394_367# a_955_271# VGND VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
+X0 VGND D a_437_144# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_547_167# a_437_144# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR D a_437_144# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_955_271# a_630_167# a_1211_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND a_955_271# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_207_40# a_112_70# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_955_271# a_625_377# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND GATE_N a_112_70# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_955_271# a_1394_367# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 VGND a_955_271# a_716_167# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_207_40# a_112_70# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 a_630_167# a_207_40# a_813_377# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 a_813_377# a_437_144# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 VPWR a_955_271# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_547_167# a_112_70# a_630_167# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 Q_N a_1394_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 VGND a_955_271# a_1394_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_955_271# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VPWR GATE_N a_112_70# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 VPWR a_630_167# a_955_271# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 a_1211_47# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 a_625_377# a_112_70# a_630_167# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 Q_N a_1394_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_630_167# a_207_40# a_716_167# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.cdl b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.cdl
index d57680a..730535c 100644
--- a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.cdl
+++ b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_lp__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.64 l=0.15 mult=1 sa=0.265
+MI635 clkneg 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
+MI648 Q_N net79 VPB pfet_01v8_hvt m=2 w=1.26 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 net79 VPB phighvt m=2 w=1.26 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 net79 m1 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
-MI650 Q m1 VPB phighvt m=2 w=1.26 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.64 l=0.15 mult=1 sa=0.265
+MI17 M0 clkneg 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 m1 RESET_B VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MI646 net79 m1 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
-MI18 net51 db 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
-MI653 net59 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.26 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.64 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.42 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=2 w=1.26 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 net79 VNB nshort 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=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
-MI645 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
-MI657 net86 RESET_B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N 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 m1 RESET_B VPB pfet_01v8_hvt m=1 w=1.26 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=1 w=0.84 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.42 l=0.15 mult=1 sa=0.265
+MI18 net51 db 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 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 net59 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net79 VNB nfet_01v8 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 nfet_01v8 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
-MI19 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI645 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
+MI657 net86 RESET_B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net98 db VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net98 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlrbn_2
diff --git a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.netlist.tsv b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.netlist.tsv
index bd04dc8..3f641bd 100644
--- a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.netlist.tsv
+++ b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_lp__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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net79	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net79	m1	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	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	net59	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net79	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net79	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net86	RESET_B	VGND	VNB	nshort	1	0.84	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	net86	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nshort	1	0.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net79	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net79	m1	VPWR	VPB	pfet_01v8_hvt	1	0.64	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.26	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	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	net59	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.26	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.64	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net79	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net79	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net86	RESET_B	VGND	VNB	nfet_01v8	1	0.84	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	net86	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	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/dlrbn/sky130_fd_sc_lp__dlrbn_2.spice b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.spice
index 28e8d0a..d960368 100644
--- a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.spice
+++ b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_lp__dlrbn_2 D GATE_N RESET_B VGND VNB VPB VPWR Q Q_N
-M1000 Q a_942_252# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=2.4762e+12p ps=2.158e+07u
-M1001 Q_N a_1555_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1002 VGND RESET_B a_1184_60# VNB nshort w=840000u l=150000u
-+  ad=1.4112e+12p pd=1.355e+07u as=1.764e+11p ps=2.1e+06u
-M1003 VGND a_1555_367# Q_N VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1004 a_677_155# a_942_252# VGND VNB nshort w=420000u l=150000u
-+  ad=2.562e+11p pd=2.9e+06u as=0p ps=0u
-M1005 a_606_359# a_942_252# VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.226e+11p pd=2.74e+06u as=0p ps=0u
-M1006 VPWR RESET_B a_942_252# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1007 a_113_144# GATE_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1008 a_392_144# D VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1009 Q a_942_252# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1010 a_1555_367# a_942_252# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1011 a_1555_367# a_942_252# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1012 VPWR a_113_144# a_162_40# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1013 Q_N a_1555_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_392_144# a_508_155# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.31e+11p ps=2.78e+06u
-M1015 a_794_359# a_162_40# a_591_155# VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=2.158e+11p ps=2.03e+06u
-M1016 VGND a_113_144# a_162_40# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1017 a_392_144# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1018 VPWR a_392_144# a_794_359# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_677_155# a_162_40# a_591_155# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1020 a_942_252# a_591_155# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_942_252# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_942_252# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR a_1555_367# Q_N VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_591_155# a_113_144# a_606_359# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_591_155# a_113_144# a_508_155# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_113_144# GATE_N VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1027 a_1184_60# a_591_155# a_942_252# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
+X0 a_942_252# a_591_155# a_1184_60# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND a_942_252# a_1555_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_508_155# a_392_144# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR a_942_252# a_606_359# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VGND GATE_N a_113_144# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR a_942_252# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 Q_N a_1555_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VPWR a_1555_367# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR a_591_155# a_942_252# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VGND a_1555_367# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_591_155# a_162_40# a_677_155# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR GATE_N a_113_144# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 a_591_155# a_162_40# a_794_359# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 a_794_359# a_392_144# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 VGND a_942_252# a_677_155# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 Q a_942_252# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_162_40# a_113_144# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_942_252# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 a_508_155# a_113_144# a_591_155# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_1184_60# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 Q_N a_1555_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 a_606_359# a_113_144# a_591_155# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 VGND a_942_252# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 Q a_942_252# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 VGND D a_392_144# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_162_40# a_113_144# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X26 VPWR D a_392_144# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X27 VPWR a_942_252# a_1555_367# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.cdl b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.cdl
index 25ec75b..8895816 100644
--- a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.cdl
+++ b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.cdl
@@ -16,64 +16,64 @@
 
 .SUBCKT sky130_fd_sc_lp__dlrbn_lp 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=1 l=0.25 mult=1 sa=0.265
+MI635 clkneg clkpos 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
-MI648 Q_N net154 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 M0 clkneg 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
-MI646 net154 m1 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
-MI650 Q m1 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
-MI633 clkpos GATE_N VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265
+MI648 Q_N net154 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
-MI658 m1 RESET_B 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
-MI18 net66 db 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
-MI653 net62 m1 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
-MI651 M0 clkpos 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
-MI655 m1 M0 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
-MI638 db D 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
-MI634 clkpos GATE_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI17 M0 clkneg 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
-MI647 Q_N net154 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nshort m=1 w=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 net154 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 net137 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI646 net154 m1 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
-MI652 M0 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 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
-MI654 net145 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 net134 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
-MI636 clkneg clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N 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
-MI637 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
-MI19 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
-MI20 net121 db VNB nshort m=1 w=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 net114 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
-MI25 net110 net154 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B 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
-MI23 net106 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
-MI22 net102 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI18 net66 db 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
-MI21 net98 GATE_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 net62 m1 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
+MI651 M0 clkpos 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
+MI655 m1 M0 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
+MI638 db D 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
+MI634 clkpos GATE_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net154 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 net154 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 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.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 net145 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 net134 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
+MI636 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net121 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 net114 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
+MI25 net110 net154 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 net106 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
+MI22 net102 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
+MI21 net98 GATE_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlrbn_lp
diff --git a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.netlist.tsv b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.netlist.tsv
index e5a6bfb..5f0a707 100644
--- a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.netlist.tsv
+++ b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.netlist.tsv
@@ -1,32 +1,32 @@
 sky130_fd_sc_lp__dlrbn_lp	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	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net154	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net66	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net154	m1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net66	db	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net62	m1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net62	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net154	net110	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	net114	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net154	m1	net134	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net137	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net145	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net145	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	net137	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	net134	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	net102	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	net106	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net121	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net121	db	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net114	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net110	net154	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net106	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net102	clkpos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net98	GATE_N	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net154	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net66	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net154	m1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net66	db	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net62	m1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net62	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	GATE_N	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net154	net110	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	net114	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net154	m1	net134	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net137	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	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	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	net137	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	net134	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	net102	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	net106	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net121	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net121	db	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net114	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net110	net154	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net106	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net102	clkpos	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net98	GATE_N	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/dlrbn/sky130_fd_sc_lp__dlrbn_lp.spice b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.spice
index ebde921..12c0cc6 100644
--- a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.spice
+++ b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.spice
@@ -16,64 +16,34 @@
 
 
 .subckt sky130_fd_sc_lp__dlrbn_lp D GATE_N RESET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_796_419# a_451_419# a_698_419# VPB phighvt w=1e+06u l=250000u
-+  ad=2.9e+11p pd=2.58e+06u as=2.4e+11p ps=2.48e+06u
-M1001 Q a_952_305# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=2.72e+12p ps=1.544e+07u
-M1002 VGND D a_114_68# VNB nshort w=420000u l=150000u
-+  ad=7.548e+11p pd=7.82e+06u as=8.82e+10p ps=1.26e+06u
-M1003 a_252_396# GATE_N VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1004 a_1703_76# a_952_305# a_1617_76# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1005 a_952_305# a_796_419# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.8e+11p pd=2.56e+06u as=0p ps=0u
-M1006 VGND a_952_305# a_1703_76# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_252_396# a_542_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1008 Q a_952_305# a_1435_153# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=8.82e+10p ps=1.26e+06u
-M1009 a_904_419# a_252_396# a_796_419# VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1010 VGND RESET_B a_1277_153# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1011 a_758_47# a_27_68# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1012 a_796_419# a_252_396# a_758_47# VNB nshort w=420000u l=150000u
-+  ad=1.764e+11p pd=1.68e+06u as=0p ps=0u
-M1013 VPWR D a_27_68# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1014 a_1435_153# a_952_305# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_114_68# D a_27_68# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1016 Q_N a_1617_76# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1017 VPWR a_252_396# a_451_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1018 a_272_68# GATE_N VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1019 a_252_396# GATE_N a_272_68# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1020 a_698_419# a_27_68# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_542_47# a_252_396# a_451_419# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1022 a_950_47# a_451_419# a_796_419# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1023 a_1861_76# a_1617_76# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1024 a_1277_153# a_796_419# a_952_305# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1025 Q_N a_1617_76# a_1861_76# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1026 VPWR a_952_305# a_904_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_952_305# a_1617_76# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1028 VPWR RESET_B a_952_305# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND a_952_305# a_950_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND GATE_N a_272_68# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_27_68# D a_114_68# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND a_27_68# a_758_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_451_419# a_252_396# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_1277_153# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_952_305# a_796_419# a_1277_153# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_1861_76# a_1617_76# Q_N VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_796_419# a_952_305# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 VGND a_952_305# a_1435_153# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR a_27_68# a_698_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 a_796_419# a_252_396# a_904_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 VPWR a_1617_76# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 a_698_419# a_451_419# a_796_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X13 a_904_419# a_952_305# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X14 a_1703_76# a_952_305# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_451_419# a_252_396# a_542_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_950_47# a_952_305# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND a_1617_76# a_1861_76# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_27_68# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X19 VPWR a_952_305# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X20 a_272_68# GATE_N a_252_396# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_1617_76# a_952_305# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X22 a_758_47# a_252_396# a_796_419# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_1435_153# a_952_305# Q VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_542_47# a_252_396# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_796_419# a_451_419# a_950_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_952_305# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X27 VPWR GATE_N a_252_396# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X28 a_1617_76# a_952_305# a_1703_76# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_114_68# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.cdl b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.cdl
index 93430fc..41426f1 100644
--- a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.cdl
+++ b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_lp__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.64 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg 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
+MI648 Q_N net79 VPB pfet_01v8_hvt m=1 w=1.26 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 net79 VPB phighvt m=1 w=1.26 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 net79 m1 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
-MI650 Q m1 VPB phighvt m=1 w=1.26 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.64 l=0.15 mult=1 sa=0.265
+MI17 M0 clkneg 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 m1 RESET_B VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MI646 net79 m1 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
-MI18 net51 db 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
-MI653 net59 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.26 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.64 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.42 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=1 w=1.26 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 net79 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 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
-MI657 net86 RESET_B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI633 clkneg GATE 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 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=1 w=0.84 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.42 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI18 net51 db 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 net59 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkneg GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net79 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI645 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
+MI657 net86 RESET_B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net98 db 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net98 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlrbp_1
diff --git a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.netlist.tsv b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.netlist.tsv
index ff0b26d..a388fa5 100644
--- a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.netlist.tsv
+++ b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_lp__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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net79	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net79	m1	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	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	net59	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net79	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net79	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net86	RESET_B	VGND	VNB	nshort	1	0.84	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	net86	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nshort	1	0.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net79	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net79	m1	VPWR	VPB	pfet_01v8_hvt	1	0.64	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.26	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	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	net59	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.26	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net79	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net79	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net86	RESET_B	VGND	VNB	nfet_01v8	1	0.84	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	net86	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	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/dlrbp/sky130_fd_sc_lp__dlrbp_1.spice b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.spice
index 896a172..9f0221b 100644
--- a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.spice
+++ b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_lp__dlrbp_1 D GATE RESET_B VGND VNB VPB VPWR Q Q_N
-M1000 Q a_776_93# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=1.6684e+12p ps=1.384e+07u
-M1001 a_773_525# a_218_483# a_626_119# VPB phighvt w=420000u l=150000u
-+  ad=1.848e+11p pd=1.72e+06u as=2.158e+11p ps=2.03e+06u
-M1002 VGND a_1187_131# Q_N VNB nshort w=840000u l=150000u
-+  ad=9.66e+11p pd=9.32e+06u as=2.226e+11p ps=2.21e+06u
-M1003 VPWR D a_373_481# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1004 VGND GATE a_49_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 VGND RESET_B a_1000_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=2.1e+06u
-M1006 a_776_93# a_626_119# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1007 a_1187_131# a_776_93# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1008 Q a_776_93# VGND VNB nshort w=840000u l=150000u
-+  ad=2.31e+11p pd=2.23e+06u as=0p ps=0u
-M1009 a_596_481# a_373_481# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1010 VPWR a_776_93# a_773_525# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR GATE a_49_93# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1012 VPWR a_1187_131# Q_N VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1013 a_1000_47# a_626_119# a_776_93# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1014 a_626_119# a_49_93# a_596_481# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_626_119# a_218_483# a_554_119# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=8.82e+10p ps=1.26e+06u
-M1016 a_1187_131# a_776_93# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1017 VGND D a_373_481# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1018 a_554_119# a_373_481# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_776_93# a_734_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1020 a_218_483# a_49_93# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1021 a_734_119# a_49_93# a_626_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR RESET_B a_776_93# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_218_483# a_49_93# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 a_626_119# a_218_483# a_773_525# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_1000_47# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_373_481# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Q_N a_1187_131# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR a_49_93# a_218_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 VGND a_776_93# a_1187_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_49_93# a_218_483# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_776_93# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR a_626_119# a_776_93# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR a_776_93# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VGND a_373_481# a_554_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_626_119# a_49_93# a_734_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND a_776_93# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_373_481# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 a_773_525# a_776_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 a_49_93# GATE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X16 a_554_119# a_218_483# a_626_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_734_119# a_776_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_776_93# a_626_119# a_1000_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 VPWR a_373_481# a_596_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 a_596_481# a_49_93# a_626_119# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X21 VPWR a_776_93# a_1187_131# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 Q_N a_1187_131# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_49_93# GATE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.cdl b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.cdl
index 8682280..ff06f35 100644
--- a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.cdl
+++ b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_lp__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.64 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg 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
+MI648 Q_N net79 VPB pfet_01v8_hvt m=2 w=1.26 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 net79 VPB phighvt m=2 w=1.26 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 net79 m1 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
-MI650 Q m1 VPB phighvt m=2 w=1.26 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.64 l=0.15 mult=1 sa=0.265
+MI17 M0 clkneg 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 m1 RESET_B VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MI646 net79 m1 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
-MI18 net51 db 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
-MI653 net59 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.26 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.64 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.42 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=2 w=1.26 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 net79 VNB nshort 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=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
-MI645 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
-MI657 net86 RESET_B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI633 clkneg GATE 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 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=1 w=0.84 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.42 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI18 net51 db 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 net59 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkneg GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net79 VNB nfet_01v8 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 nfet_01v8 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
-MI19 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI645 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
+MI657 net86 RESET_B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net98 db 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net98 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlrbp_2
diff --git a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.netlist.tsv b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.netlist.tsv
index 7990af0..0cd8e17 100644
--- a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.netlist.tsv
+++ b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_lp__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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net79	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net79	m1	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	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	net59	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net79	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net79	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net86	RESET_B	VGND	VNB	nshort	1	0.84	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	net86	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nshort	1	0.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net79	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net79	m1	VPWR	VPB	pfet_01v8_hvt	1	0.64	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.26	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	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	net59	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.26	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net79	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net79	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net86	RESET_B	VGND	VNB	nfet_01v8	1	0.84	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	net86	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	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/dlrbp/sky130_fd_sc_lp__dlrbp_2.spice b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.spice
index 5f44fda..c322231 100644
--- a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.spice
+++ b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_lp__dlrbp_2 D GATE RESET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_823_25# a_1023_405# a_981_503# VPB phighvt w=420000u l=150000u
-+  ad=2.158e+11p pd=2.03e+06u as=1.848e+11p ps=1.72e+06u
-M1001 Q a_432_109# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=2.5951e+12p ps=2.041e+07u
-M1002 a_781_51# RESET_B VGND VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=1.4721e+12p ps=1.368e+07u
-M1003 a_432_109# RESET_B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1004 VPWR a_1109_21# a_1023_405# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1005 a_432_109# a_823_25# a_781_51# VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1006 VPWR a_80_21# Q_N VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.591e+11p ps=3.09e+06u
-M1007 Q_N a_80_21# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1008 a_1109_21# GATE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1009 VGND a_432_109# a_80_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1010 VGND a_1109_21# a_1023_405# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1011 Q a_432_109# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1012 VGND a_80_21# Q_N VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_823_25# a_1109_21# a_1067_119# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=8.82e+10p ps=1.26e+06u
-M1014 VPWR a_432_109# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_981_503# a_432_109# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1204_459# a_1109_21# a_823_25# VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1017 a_1246_339# D VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1018 a_1225_119# a_1023_405# a_823_25# VNB nshort w=420000u l=150000u
-+  ad=1.344e+11p pd=1.48e+06u as=0p ps=0u
-M1019 a_1067_119# a_432_109# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1109_21# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1021 VPWR a_432_109# a_80_21# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1022 VPWR a_823_25# a_432_109# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR a_1246_339# a_1204_459# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_1246_339# a_1225_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_432_109# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1246_339# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1027 Q_N a_80_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_781_51# a_823_25# a_432_109# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_823_25# a_1109_21# a_1204_459# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_1204_459# a_1246_339# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 VPWR GATE a_1109_21# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 VGND a_432_109# a_1067_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR a_432_109# a_981_503# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VPWR D a_1246_339# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 VGND a_80_21# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_432_109# a_823_25# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_981_503# a_1023_405# a_823_25# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 VGND a_432_109# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 Q_N a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VPWR RESET_B a_432_109# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 Q a_432_109# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 VPWR a_80_21# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VGND RESET_B a_781_51# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_1023_405# a_1109_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VPWR a_432_109# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VGND GATE a_1109_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_80_21# a_432_109# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 a_1225_119# a_1246_339# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_1023_405# a_1109_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 Q a_432_109# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 a_823_25# a_1023_405# a_1225_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_80_21# a_432_109# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 VGND D a_1246_339# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 Q_N a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 a_1067_119# a_1109_21# a_823_25# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.cdl b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.cdl
index 7577913..6f06669 100644
--- a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.cdl
+++ b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.cdl
@@ -16,64 +16,64 @@
 
 .SUBCKT sky130_fd_sc_lp__dlrbp_lp 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=1 l=0.25 mult=1 sa=0.265
+MI635 clkpos clkneg 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
-MI648 Q_N net154 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 M0 clkneg 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
-MI646 net154 m1 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
-MI650 Q m1 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
-MI633 clkneg GATE 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
-MI658 m1 RESET_B 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
-MI18 net66 db 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
-MI653 net62 m1 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
-MI651 M0 clkpos 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
-MI655 m1 M0 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
-MI638 db D 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
-MI634 clkneg GATE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI648 Q_N net154 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
-MI647 Q_N net154 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nshort m=1 w=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 net154 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 net137 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI17 M0 clkneg 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
-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 net145 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 net134 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI646 net154 m1 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
-MI637 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 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
-MI19 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
-MI20 net121 db VNB nshort m=1 w=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 net114 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
-MI25 net110 net154 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI633 clkneg GATE 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
-MI23 net106 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
-MI22 net102 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B 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
-MI21 net98 GATE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI18 net66 db 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
+MI653 net62 m1 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
+MI651 M0 clkpos 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
+MI655 m1 M0 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
+MI638 db D 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
+MI634 clkneg GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net154 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 net154 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 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.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 net145 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 net134 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
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net121 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 net114 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
+MI25 net110 net154 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 net106 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
+MI22 net102 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
+MI21 net98 GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlrbp_lp
diff --git a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.netlist.tsv b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.netlist.tsv
index 106efe5..ca9b854 100644
--- a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.netlist.tsv
+++ b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.netlist.tsv
@@ -1,32 +1,32 @@
 sky130_fd_sc_lp__dlrbp_lp	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	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net154	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net66	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net154	m1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net66	db	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net62	m1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net62	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net154	net110	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	net114	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net154	m1	net134	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net137	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net145	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net145	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	net137	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	net134	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	net102	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	net106	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net121	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net121	db	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net114	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net110	net154	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net106	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net102	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net98	GATE	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net154	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net66	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net154	m1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkneg	GATE	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net66	db	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net62	m1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net62	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net154	net110	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	net114	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net154	m1	net134	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net137	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	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	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	net137	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	net134	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	net102	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	net106	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net121	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net121	db	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net114	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net110	net154	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net106	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net102	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net98	GATE	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/dlrbp/sky130_fd_sc_lp__dlrbp_lp.spice b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.spice
index b826e34..ef54cc5 100644
--- a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.spice
+++ b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.spice
@@ -16,64 +16,34 @@
 
 
 .subckt sky130_fd_sc_lp__dlrbp_lp D GATE RESET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_272_419# GATE a_272_112# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VGND a_1028_23# a_1701_74# VNB nshort w=420000u l=150000u
-+  ad=6.258e+11p pd=7.18e+06u as=8.82e+10p ps=1.26e+06u
-M1002 VPWR a_1028_23# a_955_367# VPB phighvt w=1e+06u l=250000u
-+  ad=1.553e+12p pd=1.337e+07u as=3.65e+11p ps=2.73e+06u
-M1003 Q a_1028_23# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1004 VPWR a_1028_23# a_1614_74# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1005 a_1431_49# a_1028_23# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1006 VGND D a_114_112# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1007 a_778_49# a_272_419# a_692_367# VPB phighvt w=1e+06u l=250000u
-+  ad=5.75e+11p pd=3.15e+06u as=2.4e+11p ps=2.48e+06u
-M1008 a_272_112# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_955_367# a_455_49# a_778_49# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_272_419# a_542_49# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1011 VPWR a_272_419# a_455_49# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1012 Q_N a_1614_74# a_1859_74# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1013 a_272_419# GATE VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1014 a_114_112# D a_27_112# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1015 VPWR RESET_B a_1028_23# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=4.69e+11p ps=3.08e+06u
-M1016 a_542_49# a_272_419# a_455_49# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1017 a_1859_74# a_1614_74# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_700_49# a_27_112# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1019 a_944_49# a_272_419# a_778_49# VNB nshort w=420000u l=150000u
-+  ad=1.764e+11p pd=1.68e+06u as=2.856e+11p ps=2.2e+06u
-M1020 a_1273_49# a_778_49# a_1028_23# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1021 a_1028_23# a_778_49# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Q_N a_1614_74# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1023 VGND RESET_B a_1273_49# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Q a_1028_23# a_1431_49# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1025 a_692_367# a_27_112# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_778_49# a_455_49# a_700_49# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR D a_27_112# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1028 VGND a_1028_23# a_944_49# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1701_74# a_1028_23# a_1614_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
+X0 a_1028_23# a_778_49# a_1273_49# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR a_1614_74# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_455_49# a_272_419# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 VGND GATE a_272_112# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_1701_74# a_1028_23# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_778_49# a_455_49# a_955_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_1028_23# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 VPWR a_778_49# a_1028_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 VGND a_1614_74# a_1859_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_1614_74# a_1028_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 a_1614_74# a_1028_23# a_1701_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_455_49# a_272_419# a_542_49# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_944_49# a_1028_23# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VPWR GATE a_272_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X14 VPWR a_27_112# a_692_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X15 a_700_49# a_455_49# a_778_49# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_542_49# a_272_419# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_778_49# a_272_419# a_944_49# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_1273_49# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VGND a_1028_23# a_1431_49# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_692_367# a_272_419# a_778_49# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X21 VGND a_27_112# a_700_49# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_114_112# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_1431_49# a_1028_23# Q VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_27_112# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X25 a_27_112# D a_114_112# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_1859_74# a_1614_74# Q_N VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_272_112# GATE a_272_419# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 VPWR a_1028_23# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X29 a_955_367# a_1028_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.cdl b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.cdl
index af9f9c1..d5417f1 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.cdl
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_lp__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.64 l=0.15 mult=1 sa=0.265
+MI635 clkneg 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
+MI17 M0 clkneg 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
-MI17 M0 clkneg 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
-MI650 Q m1 VPB phighvt m=1 w=1.26 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.64 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N 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 m1 RESET_B VPB pfet_01v8_hvt m=1 w=1.26 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=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 net59 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.26 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.64 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.42 l=0.15 mult=1 sa=0.265
+MI18 net51 db 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
-MI649 Q m1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net86 RESET_B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI653 net59 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=1 w=0.84 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net86 RESET_B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net98 db VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net98 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlrtn_1
diff --git a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.netlist.tsv b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.netlist.tsv
index ab05fc7..9e50d4d 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.netlist.tsv
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_lp__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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	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	net59	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net86	RESET_B	VGND	VNB	nshort	1	0.84	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	net86	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nshort	1	0.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	0.64	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.26	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	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	net59	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.26	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.64	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net86	RESET_B	VGND	VNB	nfet_01v8	1	0.84	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	net86	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	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/dlrtn/sky130_fd_sc_lp__dlrtn_1.spice b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.spice
index e6035da..ec0b83b 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.spice
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__dlrtn_1 D GATE_N RESET_B VGND VNB VPB VPWR Q
-M1000 a_820_99# a_670_125# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=1.6208e+12p ps=1.165e+07u
-M1001 VPWR a_270_465# a_387_385# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.459e+11p ps=2.7e+06u
-M1002 a_270_465# GATE_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.379e+11p ps=7.41e+06u
-M1003 a_670_125# a_387_385# a_598_447# VPB phighvt w=640000u l=150000u
-+  ad=2.276e+11p pd=2.06e+06u as=1.344e+11p ps=1.7e+06u
-M1004 a_598_447# a_47_47# VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND RESET_B a_1040_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=2.1e+06u
-M1006 a_756_125# a_387_385# a_670_125# VNB nshort w=420000u l=150000u
-+  ad=1.344e+11p pd=1.48e+06u as=1.176e+11p ps=1.4e+06u
-M1007 VPWR RESET_B a_820_99# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR D a_47_47# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1009 VGND a_270_465# a_387_385# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1010 Q a_820_99# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1011 a_270_465# GATE_N VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1012 a_598_125# a_47_47# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1013 a_1040_47# a_670_125# a_820_99# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1014 VPWR a_820_99# a_778_447# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1015 a_670_125# a_270_465# a_598_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_778_447# a_270_465# a_670_125# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Q a_820_99# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1018 VGND D a_47_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1019 VGND a_820_99# a_756_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_670_125# a_270_465# a_778_447# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VGND GATE_N a_270_465# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_47_47# a_598_447# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 VGND a_47_47# a_598_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_820_99# a_670_125# a_1040_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPWR GATE_N a_270_465# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 VPWR a_820_99# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_670_125# a_387_385# a_756_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_1040_47# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_778_447# a_820_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_820_99# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VPWR a_670_125# a_820_99# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VGND a_820_99# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_598_447# a_387_385# a_670_125# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 a_387_385# a_270_465# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_598_125# a_270_465# a_670_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_756_125# a_820_99# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_47_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_387_385# a_270_465# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 a_47_47# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.cdl b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.cdl
index 574793b..f4e94d2 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.cdl
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_lp__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.64 l=0.15 mult=1 sa=0.265
+MI635 clkneg 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
+MI17 M0 clkneg 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
-MI17 M0 clkneg 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
-MI650 Q m1 VPB phighvt m=2 w=1.26 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.64 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N 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 m1 RESET_B VPB pfet_01v8_hvt m=1 w=1.26 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=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 net59 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.26 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.64 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.42 l=0.15 mult=1 sa=0.265
+MI18 net51 db 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
-MI649 Q m1 VNB nshort 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
-MI657 net86 RESET_B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI653 net59 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=1 w=0.84 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 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
-MI19 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net86 RESET_B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net98 db VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net98 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlrtn_2
diff --git a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.netlist.tsv b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.netlist.tsv
index 2a0e822..e4323d6 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.netlist.tsv
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_lp__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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	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	net59	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net86	RESET_B	VGND	VNB	nshort	1	0.84	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	net86	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nshort	1	0.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	0.64	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.26	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	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	net59	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.26	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.64	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net86	RESET_B	VGND	VNB	nfet_01v8	1	0.84	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	net86	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	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/dlrtn/sky130_fd_sc_lp__dlrtn_2.spice b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.spice
index 19c3594..792a407 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.spice
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_lp__dlrtn_2 D GATE_N RESET_B VGND VNB VPB VPWR Q
-M1000 VPWR a_221_70# a_372_397# VPB phighvt w=640000u l=150000u
-+  ad=1.8268e+12p pd=1.445e+07u as=3.254e+11p ps=2.76e+06u
-M1001 Q a_776_99# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=8.967e+11p ps=8.84e+06u
-M1002 a_776_99# a_626_125# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1003 VGND D a_31_464# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1004 a_221_70# GATE_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1005 a_221_70# GATE_N VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1006 VGND a_776_99# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_582_473# a_31_464# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1008 Q a_776_99# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1009 a_626_125# a_372_397# a_582_473# VPB phighvt w=640000u l=150000u
-+  ad=2.286e+11p pd=2.07e+06u as=0p ps=0u
-M1010 VPWR RESET_B a_776_99# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND RESET_B a_996_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=2.1e+06u
-M1012 a_763_473# a_221_70# a_626_125# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1013 VPWR D a_31_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1014 VPWR a_776_99# a_763_473# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_626_125# a_221_70# a_554_125# VNB nshort w=420000u l=150000u
-+  ad=1.47e+11p pd=1.54e+06u as=8.82e+10p ps=1.26e+06u
-M1016 a_726_125# a_372_397# a_626_125# VNB nshort w=420000u l=150000u
-+  ad=1.05e+11p pd=1.34e+06u as=0p ps=0u
-M1017 a_996_47# a_626_125# a_776_99# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1018 VGND a_221_70# a_372_397# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1019 a_554_125# a_31_464# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_776_99# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_776_99# a_726_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_776_99# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR a_626_125# a_776_99# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_31_464# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND a_31_464# a_554_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_776_99# a_626_125# a_996_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_31_464# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 a_996_47# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_554_125# a_221_70# a_626_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND a_776_99# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 Q a_776_99# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VGND GATE_N a_221_70# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_726_125# a_776_99# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VPWR a_776_99# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_626_125# a_372_397# a_726_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_626_125# a_221_70# a_763_473# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 a_763_473# a_776_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 VPWR a_31_464# a_582_473# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X17 a_582_473# a_372_397# a_626_125# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 a_372_397# a_221_70# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VPWR GATE_N a_221_70# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 a_372_397# a_221_70# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X21 Q a_776_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.cdl b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.cdl
index 5ef2423..a85ce7a 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.cdl
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_lp__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.64 l=0.15 mult=1 sa=0.265
+MI635 clkneg 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
+MI17 M0 clkneg 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
-MI17 M0 clkneg 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
-MI650 Q m1 VPB phighvt m=4 w=1.26 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.64 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N 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 m1 RESET_B VPB pfet_01v8_hvt m=1 w=1.26 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=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 net59 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.26 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.64 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.42 l=0.15 mult=1 sa=0.265
+MI18 net51 db 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
-MI649 Q m1 VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net86 RESET_B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI653 net59 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=1 w=0.84 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 m=4 w=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 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net86 RESET_B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net98 db VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net98 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlrtn_4
diff --git a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.netlist.tsv b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.netlist.tsv
index 45442f7..a413d24 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.netlist.tsv
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_lp__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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	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	net59	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net86	RESET_B	VGND	VNB	nshort	1	0.84	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	net86	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nshort	1	0.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	0.64	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.26	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	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	net59	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.26	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.64	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net86	RESET_B	VGND	VNB	nfet_01v8	1	0.84	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	net86	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	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/dlrtn/sky130_fd_sc_lp__dlrtn_4.spice b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.spice
index a7f9f25..941bcf4 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.spice
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_lp__dlrtn_4 D GATE_N RESET_B VGND VNB VPB VPWR Q
-M1000 a_725_125# a_357_365# a_639_125# VNB nshort w=420000u l=150000u
-+  ad=1.344e+11p pd=1.48e+06u as=1.176e+11p ps=1.4e+06u
-M1001 a_250_70# GATE_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.2075e+12p ps=1.137e+07u
-M1002 VPWR a_250_70# a_357_365# VPB phighvt w=640000u l=150000u
-+  ad=2.2795e+12p pd=1.789e+07u as=3.329e+11p ps=2.82e+06u
-M1003 a_567_125# a_27_468# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 VGND a_789_99# a_725_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_250_70# GATE_N VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1006 VPWR RESET_B a_789_99# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1007 VPWR a_789_99# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.182e+11p ps=6.18e+06u
-M1008 VPWR a_789_99# a_748_447# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1009 VGND RESET_B a_1009_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=2.1e+06u
-M1010 a_567_447# a_27_468# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1011 Q a_789_99# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1012 Q a_789_99# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_639_125# a_357_365# a_567_447# VPB phighvt w=640000u l=150000u
-+  ad=2.286e+11p pd=2.07e+06u as=0p ps=0u
-M1014 Q a_789_99# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Q a_789_99# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND D a_27_468# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1017 VGND a_250_70# a_357_365# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1018 a_1009_47# a_639_125# a_789_99# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1019 a_789_99# a_639_125# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_748_447# a_250_70# a_639_125# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_789_99# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR D a_27_468# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1023 VGND a_789_99# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_639_125# a_250_70# a_567_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_789_99# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_357_365# a_250_70# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR GATE_N a_250_70# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 VPWR a_789_99# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_567_125# a_250_70# a_639_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_789_99# a_639_125# a_1009_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_1009_47# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VGND a_789_99# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 Q a_789_99# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND a_27_468# a_567_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_27_468# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X10 VPWR a_789_99# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VGND a_789_99# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_748_447# a_789_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 Q a_789_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 Q a_789_99# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_639_125# a_250_70# a_748_447# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 Q a_789_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_725_125# a_789_99# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VPWR a_27_468# a_567_447# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 a_567_447# a_357_365# a_639_125# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 a_357_365# a_250_70# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X21 a_27_468# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 VGND GATE_N a_250_70# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_789_99# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 a_639_125# a_357_365# a_725_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 VPWR a_639_125# a_789_99# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.cdl b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.cdl
index e02a297..9b6f866 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.cdl
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_lp__dlrtn_lp 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=1 l=0.25 mult=1 sa=0.265
+MI635 clkneg clkpos 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
-MI17 M0 clkneg 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
-MI650 Q m1 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
-MI633 clkpos GATE_N VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265
+MI17 M0 clkneg 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
-MI658 m1 RESET_B VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 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
-MI18 net56 db 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
-MI653 net52 m1 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
-MI651 M0 clkpos 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
-MI655 m1 M0 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
-MI638 db D 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
-MI634 clkpos GATE_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N 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
-MI649 Q 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 net111 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B 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
-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 net119 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.42 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.42 l=0.15 mult=1 sa=0.265
+MI18 net56 db 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
-MI637 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
-MI19 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
-MI20 net99 db VNB nshort m=1 w=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 net92 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
-MI23 net88 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
-MI22 net84 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 net52 m1 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
-MI21 net80 GATE_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI651 M0 clkpos 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
+MI655 m1 M0 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
+MI638 db D 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
+MI634 clkpos GATE_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q 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 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
+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 net119 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net99 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 net92 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 net88 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
+MI22 net84 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
+MI21 net80 GATE_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlrtn_lp
diff --git a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.netlist.tsv b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.netlist.tsv
index 342a622..76228fe 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.netlist.tsv
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_lp__dlrtn_lp	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	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net56	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net56	db	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net52	m1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net52	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	net80	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	net92	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net111	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net119	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net119	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	net111	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	net84	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	net88	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net99	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net99	db	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net92	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net88	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net84	clkpos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net80	GATE_N	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net56	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net56	db	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net52	m1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net52	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkpos	GATE_N	net80	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	net92	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	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
+MI652	MOSFET	M0	clkneg	net119	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net119	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	net111	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	net84	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	net88	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net99	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net99	db	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net92	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net88	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net84	clkpos	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net80	GATE_N	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/dlrtn/sky130_fd_sc_lp__dlrtn_lp.spice b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.spice
index e0b4d9e..92c4b68 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.spice
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_lp__dlrtn_lp D GATE_N RESET_B VGND VNB VPB VPWR Q
-M1000 VPWR D a_27_47# VPB phighvt w=1e+06u l=250000u
-+  ad=1.76e+12p pd=1.152e+07u as=2.85e+11p ps=2.57e+06u
-M1001 a_1222_57# a_744_415# a_949_335# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1002 a_744_415# a_399_415# a_646_415# VPB phighvt w=1e+06u l=250000u
-+  ad=5.35e+11p pd=3.07e+06u as=2.4e+11p ps=2.48e+06u
-M1003 a_114_47# D a_27_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1004 a_272_47# GATE_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=4.977e+11p ps=5.73e+06u
-M1005 a_264_415# GATE_N a_272_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1006 VGND RESET_B a_1222_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_898_47# a_399_415# a_744_415# VNB nshort w=420000u l=150000u
-+  ad=1.764e+11p pd=1.68e+06u as=1.638e+11p ps=1.62e+06u
-M1008 VPWR RESET_B a_949_335# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1009 VPWR a_949_335# a_901_415# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1010 VGND a_264_415# a_554_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1011 a_1380_57# a_949_335# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1012 a_264_415# GATE_N VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1013 VGND a_949_335# a_898_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Q a_949_335# a_1380_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1015 VPWR a_264_415# a_399_415# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1016 a_646_415# a_27_47# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Q a_949_335# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1018 a_554_47# a_264_415# a_399_415# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1019 VGND D a_114_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_744_415# a_264_415# a_712_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1021 a_949_335# a_744_415# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_712_47# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_901_415# a_264_415# a_744_415# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_744_415# a_264_415# a_901_415# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_114_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND a_27_47# a_712_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_898_47# a_949_335# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_27_47# D a_114_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND GATE_N a_272_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_1222_57# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_949_335# a_1380_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_949_335# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_399_415# a_264_415# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 VPWR a_744_415# a_949_335# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 a_949_335# a_744_415# a_1222_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VPWR a_949_335# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X13 a_712_47# a_264_415# a_744_415# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VPWR a_27_47# a_646_415# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X15 a_272_47# GATE_N a_264_415# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VPWR GATE_N a_264_415# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X17 a_646_415# a_399_415# a_744_415# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X18 a_1380_57# a_949_335# Q VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_901_415# a_949_335# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X20 a_399_415# a_264_415# a_554_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_27_47# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X22 a_554_47# a_264_415# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_744_415# a_399_415# a_898_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.cdl b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.cdl
index e7949a8..7e82d8d 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.cdl
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_lp__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.64 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg 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
+MI17 M0 clkneg 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
-MI17 M0 clkneg 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
-MI650 Q m1 VPB phighvt m=1 w=1.26 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.64 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265
+MI633 clkneg GATE 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
-MI18 net51 db 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
-MI653 net59 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.26 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.64 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.42 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B VPB pfet_01v8_hvt m=1 w=1.26 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net86 RESET_B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI18 net51 db 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 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=1 w=0.84 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.42 l=0.15 mult=1 sa=0.265
+MI653 net59 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.42 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkneg GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net86 RESET_B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net98 db 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net98 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlrtp_1
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.netlist.tsv b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.netlist.tsv
index 032ba3e..51ff66b 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.netlist.tsv
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_lp__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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	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	net59	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net86	RESET_B	VGND	VNB	nshort	1	0.84	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	net86	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nshort	1	0.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	0.64	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.26	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	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	net59	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.26	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net86	RESET_B	VGND	VNB	nfet_01v8	1	0.84	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	net86	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	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/dlrtp/sky130_fd_sc_lp__dlrtp_1.spice b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.spice
index 5115524..c0b6c66 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.spice
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__dlrtp_1 D GATE RESET_B VGND VNB VPB VPWR Q
-M1000 VGND D a_41_464# VNB nshort w=420000u l=150000u
-+  ad=7.791e+11p pd=7.13e+06u as=1.113e+11p ps=1.37e+06u
-M1001 VPWR a_249_70# a_371_473# VPB phighvt w=640000u l=150000u
-+  ad=1.7295e+12p pd=1.213e+07u as=1.696e+11p ps=1.81e+06u
-M1002 a_623_473# a_41_464# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1003 a_587_47# a_41_464# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 a_809_21# a_659_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1005 a_659_47# a_371_473# a_587_47# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1006 a_1056_73# a_659_47# a_809_21# VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=2.226e+11p ps=2.21e+06u
-M1007 a_659_47# a_249_70# a_623_473# VPB phighvt w=640000u l=150000u
-+  ad=2.158e+11p pd=2.03e+06u as=0p ps=0u
-M1008 VPWR a_809_21# a_800_473# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1009 a_767_47# a_249_70# a_659_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1010 VGND a_809_21# a_767_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Q a_809_21# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1012 VGND a_249_70# a_371_473# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1013 a_249_70# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1014 a_249_70# GATE VPWR VPB phighvt w=640000u l=150000u
-+  ad=2.048e+11p pd=1.92e+06u as=0p ps=0u
-M1015 VPWR D a_41_464# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1016 VPWR RESET_B a_809_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_800_473# a_371_473# a_659_47# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Q a_809_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1019 VGND RESET_B a_1056_73# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_800_473# a_809_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_587_47# a_371_473# a_659_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_41_464# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_371_473# a_249_70# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_659_47# a_249_70# a_767_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_809_21# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND a_809_21# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_371_473# a_249_70# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 VGND GATE a_249_70# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR a_809_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VGND a_41_464# a_587_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR GATE a_249_70# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 a_809_21# a_659_47# a_1056_73# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_1056_73# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_659_47# a_371_473# a_800_473# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 a_767_47# a_809_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VPWR a_659_47# a_809_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 VPWR a_41_464# a_623_473# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 a_623_473# a_249_70# a_659_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 a_41_464# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.cdl b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.cdl
index 9cf305b..6af8c5a 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.cdl
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_lp__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.64 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg 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
+MI17 M0 clkneg 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
-MI17 M0 clkneg 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
-MI650 Q m1 VPB phighvt m=2 w=1.26 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.64 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265
+MI633 clkneg GATE 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
-MI18 net51 db 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
-MI653 net59 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.26 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.64 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.42 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B VPB pfet_01v8_hvt m=1 w=1.26 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net86 RESET_B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI18 net51 db 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 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=1 w=0.84 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.42 l=0.15 mult=1 sa=0.265
+MI653 net59 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.42 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkneg GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 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
-MI19 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net86 RESET_B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net98 db 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net98 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlrtp_2
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.netlist.tsv b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.netlist.tsv
index 3e4e6b9..81d130c 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.netlist.tsv
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_lp__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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	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	net59	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net86	RESET_B	VGND	VNB	nshort	1	0.84	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	net86	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nshort	1	0.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	0.64	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.26	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	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	net59	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.26	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net86	RESET_B	VGND	VNB	nfet_01v8	1	0.84	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	net86	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	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/dlrtp/sky130_fd_sc_lp__dlrtp_2.spice b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.spice
index 5f45868..cd75415 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.spice
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_lp__dlrtp_2 D GATE RESET_B VGND VNB VPB VPWR Q
-M1000 VPWR a_796_21# a_785_479# VPB phighvt w=420000u l=150000u
-+  ad=2.2398e+12p pd=1.537e+07u as=1.008e+11p ps=1.32e+06u
-M1001 VPWR a_796_21# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1002 VGND RESET_B a_1043_73# VNB nshort w=840000u l=150000u
-+  ad=1.1025e+12p pd=9.76e+06u as=1.764e+11p ps=2.1e+06u
-M1003 a_251_475# GATE VPWR VPB phighvt w=640000u l=150000u
-+  ad=2.08e+11p pd=1.93e+06u as=0p ps=0u
-M1004 a_574_47# a_40_54# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1005 VGND a_796_21# a_754_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1006 Q a_796_21# VGND VNB nshort w=840000u l=150000u
-+  ad=3.318e+11p pd=2.47e+06u as=0p ps=0u
-M1007 a_646_47# a_383_479# a_574_47# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1008 a_1043_73# a_646_47# a_796_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1009 Q a_796_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_611_479# a_40_54# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1011 VGND D a_40_54# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1012 a_796_21# a_646_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1013 a_646_47# a_251_475# a_611_479# VPB phighvt w=640000u l=150000u
-+  ad=2.062e+11p pd=2e+06u as=0p ps=0u
-M1014 a_785_479# a_383_479# a_646_47# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_754_47# a_251_475# a_646_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_796_21# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR D a_40_54# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1018 VPWR RESET_B a_796_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_251_475# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1020 VPWR a_251_475# a_383_479# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1021 VGND a_251_475# a_383_479# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
+X0 Q a_796_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_383_479# a_251_475# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_574_47# a_383_479# a_646_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_646_47# a_251_475# a_754_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR a_796_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_646_47# a_383_479# a_785_479# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_754_47# a_796_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR GATE a_251_475# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 a_40_54# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_796_21# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_383_479# a_251_475# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 Q a_796_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VGND a_40_54# a_574_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_40_54# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 a_796_21# a_646_47# a_1043_73# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_1043_73# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 VGND GATE a_251_475# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND a_796_21# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_785_479# a_796_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 VPWR a_40_54# a_611_479# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 a_611_479# a_251_475# a_646_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X21 VPWR a_646_47# a_796_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.cdl b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.cdl
index f4ed849..c95942d 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.cdl
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_lp__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.64 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg 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
+MI17 M0 clkneg 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
-MI17 M0 clkneg 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
-MI650 Q m1 VPB phighvt m=4 w=1.26 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.64 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265
+MI633 clkneg GATE 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
-MI18 net51 db 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
-MI653 net59 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.26 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.64 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.42 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B VPB pfet_01v8_hvt m=1 w=1.26 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net86 RESET_B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI18 net51 db 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 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=1 w=0.84 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.42 l=0.15 mult=1 sa=0.265
+MI653 net59 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.42 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkneg GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 m=4 w=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 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net86 RESET_B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net98 db 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net98 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlrtp_4
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.netlist.tsv b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.netlist.tsv
index 26518f0..6a38cfb 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.netlist.tsv
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_lp__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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	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	net59	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net86	RESET_B	VGND	VNB	nshort	1	0.84	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	net86	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nshort	1	0.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	0.64	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.26	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	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	net59	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.26	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net86	RESET_B	VGND	VNB	nfet_01v8	1	0.84	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	net86	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	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/dlrtp/sky130_fd_sc_lp__dlrtp_4.spice b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.spice
index f4956cd..f673e36 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.spice
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_lp__dlrtp_4 D GATE RESET_B VGND VNB VPB VPWR Q
-M1000 VPWR a_267_464# a_414_47# VPB phighvt w=640000u l=150000u
-+  ad=2.4044e+12p pd=1.823e+07u as=1.696e+11p ps=1.81e+06u
-M1001 VGND D a_49_70# VNB nshort w=420000u l=150000u
-+  ad=1.1865e+12p pd=1.156e+07u as=1.113e+11p ps=1.37e+06u
-M1002 VGND a_267_464# a_414_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1003 Q a_857_21# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1004 a_651_469# a_49_70# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1005 Q a_857_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR D a_49_70# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1007 VPWR RESET_B a_857_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1008 Q a_857_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1009 a_671_47# a_414_47# a_599_47# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=8.82e+10p ps=1.26e+06u
-M1010 VPWR a_857_21# a_828_469# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=9.45e+10p ps=1.29e+06u
-M1011 VGND a_857_21# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_599_47# a_49_70# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1083_73# a_671_47# a_857_21# VNB nshort w=840000u l=150000u
-+  ad=3.024e+11p pd=2.4e+06u as=2.226e+11p ps=2.21e+06u
-M1014 a_857_21# a_671_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Q a_857_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_828_469# a_414_47# a_671_47# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.158e+11p ps=2.03e+06u
-M1017 a_779_47# a_267_464# a_671_47# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1018 VPWR a_857_21# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_857_21# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_671_47# a_267_464# a_651_469# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND RESET_B a_1083_73# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_267_464# GATE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.856e+11p pd=1.86e+06u as=0p ps=0u
-M1023 VPWR a_857_21# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_857_21# a_779_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_267_464# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 Q a_857_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_857_21# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_599_47# a_414_47# a_671_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR a_671_47# a_857_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_49_70# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 Q a_857_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VGND a_857_21# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_828_469# a_857_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 Q a_857_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_651_469# a_267_464# a_671_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X10 a_671_47# a_267_464# a_779_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_779_47# a_857_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_414_47# a_267_464# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 Q a_857_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VPWR a_857_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VGND a_49_70# a_599_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_414_47# a_267_464# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X17 a_671_47# a_414_47# a_828_469# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 VPWR a_857_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_857_21# a_671_47# a_1083_73# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 VPWR a_49_70# a_651_469# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X21 VGND GATE a_267_464# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_1083_73# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 VGND a_857_21# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 VPWR GATE a_267_464# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X25 a_49_70# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.cdl b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.cdl
index 1438328..1cb8a10 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.cdl
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.cdl
@@ -16,64 +16,64 @@
 
 .SUBCKT sky130_fd_sc_lp__dlrtp_lp 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.64 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg 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
+MI17 M0 clkneg 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
-MI17 M0 clkneg 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
-MI650 Q m1 VPB phighvt m=1 w=1.26 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.64 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265
+MI633 clkneg GATE 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
-MI18 net51 db 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
-MI653 net59 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.26 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.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 net089 m1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 net081 RESET_B VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net065 M0 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net050 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
-MI22 net054 clkneg VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI18 net51 db 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
-MI21 net085 GATE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI653 net59 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
-MI634 clkneg GATE VNB nshort m=1 w=0.42 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
-MI649 Q m1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net86 RESET_B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 net0123 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI638 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
-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=1 w=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 net0106 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI29 net089 m1 VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI28 net081 RESET_B VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net065 M0 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net050 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
+MI22 net054 clkneg 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
+MI21 net085 GATE 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 clkneg GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net86 RESET_B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 net0123 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 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=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net98 db VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI26 net0106 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
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net0102 m1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI19 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
+MI20 net98 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 net099 GATE VNB nshort m=1 w=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 net0102 m1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 net099 GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlrtp_lp
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.netlist.tsv b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.netlist.tsv
index b3c8ab2..4b4b25e 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.netlist.tsv
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.netlist.tsv
@@ -1,32 +1,32 @@
 sky130_fd_sc_lp__dlrtp_lp	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	net054	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	net089	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	net085	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	net081	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	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	net59	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	net065	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	net050	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	net089	m1	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	net081	RESET_B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net065	M0	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net050	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net054	clkneg	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net085	GATE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	net099	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	net0102	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net86	RESET_B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net0123	clkneg	VGND	VNB	nshort	1	0.42	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	net86	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net0106	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	net0123	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	net0106	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net0102	m1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	net099	GATE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	net054	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	net089	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkneg	GATE	net085	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	m1	RESET_B	net081	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	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	net59	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	net065	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	net050	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	net089	m1	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	net081	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net065	M0	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net050	D	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net054	clkneg	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net085	GATE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	net099	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	net0102	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net86	RESET_B	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net0123	clkneg	VGND	VNB	nfet_01v8	1	0.42	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	net86	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net0106	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	net0123	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	net0106	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net0102	m1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	net099	GATE	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/dlrtp/sky130_fd_sc_lp__dlrtp_lp.spice b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.spice
index 91a935f..4daa39b 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.spice
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.spice
@@ -16,64 +16,34 @@
 
 
 .subckt sky130_fd_sc_lp__dlrtp_lp D GATE RESET_B VGND VNB VPB VPWR Q
-M1000 VPWR a_638_73# a_800_343# VPB phighvt w=640000u l=150000u
-+  ad=1.4461e+12p pd=1.238e+07u as=3.648e+11p ps=3.7e+06u
-M1001 a_186_57# GATE a_114_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1002 VGND a_186_57# a_408_73# VNB nshort w=420000u l=150000u
-+  ad=1.3923e+12p pd=8.44e+06u as=8.82e+10p ps=1.26e+06u
-M1003 a_1420_367# a_887_343# a_1208_75# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.182e+11p pd=6.18e+06u as=3.528e+11p ps=3.08e+06u
-M1004 a_384_345# a_186_57# a_294_547# VPB phighvt w=640000u l=150000u
-+  ad=2.304e+11p pd=2e+06u as=1.824e+11p ps=1.85e+06u
-M1005 VPWR a_186_57# a_384_345# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_408_73# a_186_57# a_294_547# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.086e+11p ps=1.92e+06u
-M1007 Q a_1208_75# a_1857_47# VNB nshort w=840000u l=150000u
-+  ad=2.604e+11p pd=2.3e+06u as=1.764e+11p ps=2.1e+06u
-M1008 a_617_345# D VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1009 a_996_343# a_1208_75# VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.394e+11p pd=2.82e+06u as=0p ps=0u
-M1010 a_114_57# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_638_73# D a_617_345# VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1012 a_1593_367# RESET_B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1013 a_1208_75# RESET_B a_1593_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_638_73# a_1058_101# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1015 a_1510_47# a_887_343# a_1208_75# VNB nshort w=840000u l=150000u
-+  ad=2.016e+11p pd=2.16e+06u as=2.394e+11p ps=2.25e+06u
-M1016 a_1857_47# a_1208_75# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_887_343# a_186_57# a_800_343# VPB phighvt w=640000u l=150000u
-+  ad=2.286e+11p pd=2.07e+06u as=0p ps=0u
-M1018 a_186_57# GATE a_114_470# VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=1.344e+11p ps=1.7e+06u
-M1019 a_566_73# D VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1020 a_638_73# D a_566_73# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1021 VGND RESET_B a_1510_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_114_470# GATE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1949_367# a_1208_75# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.024e+11p pd=3e+06u as=0p ps=0u
-M1024 Q a_1208_75# a_1949_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1025 VPWR a_887_343# a_1420_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1058_101# a_294_547# a_887_343# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1027 a_996_343# a_294_547# a_887_343# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_887_343# a_186_57# a_862_101# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.877e+11p ps=3.05e+06u
-M1029 a_862_101# a_1208_75# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_566_73# D a_638_73# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_408_73# a_186_57# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_384_345# a_186_57# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_1208_75# a_887_343# a_1420_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR a_1208_75# a_1949_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND a_1208_75# a_1857_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_862_101# a_186_57# a_887_343# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_1949_367# a_1208_75# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND D a_566_73# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_1857_47# a_1208_75# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VPWR a_1208_75# a_996_343# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_1510_47# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_887_343# a_294_547# a_996_343# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 a_800_343# a_638_73# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 a_800_343# a_186_57# a_887_343# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X15 a_1208_75# a_887_343# a_1510_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_887_343# a_294_547# a_1058_101# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_114_470# GATE a_186_57# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 a_1420_367# a_887_343# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_294_547# a_186_57# a_408_73# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VGND a_1208_75# a_862_101# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 VPWR GATE a_114_470# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 VPWR D a_617_345# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X23 a_617_345# D a_638_73# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X24 a_114_57# GATE a_186_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 VGND GATE a_114_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_294_547# a_186_57# a_384_345# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X27 a_1058_101# a_638_73# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 VPWR RESET_B a_1593_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 a_1593_367# RESET_B a_1208_75# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.cdl b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.cdl
index 6afc37c..8bee3ca 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.cdl
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_lp__dlrtp_lp2 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=1 l=0.25 mult=1 sa=0.265
+MI635 clkpos clkneg 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
-MI17 M0 clkneg 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
-MI650 Q m1 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
-MI633 clkneg GATE 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
-MI658 m1 RESET_B 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
-MI18 net56 db 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
-MI653 net52 m1 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
-MI651 M0 clkpos 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
-MI655 m1 M0 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
-MI638 db D 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
-MI634 clkneg GATE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI17 M0 clkneg 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
-MI649 Q m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 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
-MI657 net111 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI633 clkneg GATE 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
-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 net119 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.42 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.42 l=0.15 mult=1 sa=0.265
+MI658 m1 RESET_B 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
-MI637 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
-MI19 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
-MI20 net99 db VNB nshort m=1 w=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 net92 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
-MI23 net88 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
-MI22 net84 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI18 net56 db 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
-MI21 net80 GATE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 net52 m1 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
+MI651 M0 clkpos 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
+MI655 m1 M0 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
+MI638 db D 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
+MI634 clkneg GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q 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 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
+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 net119 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net99 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 net92 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 net88 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
+MI22 net84 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
+MI21 net80 GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlrtp_lp2
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.netlist.tsv b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.netlist.tsv
index 2527141..e4bad62 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.netlist.tsv
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_lp__dlrtp_lp2	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	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net56	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	RESET_B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net56	db	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net52	m1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net52	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	net80	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	net92	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net111	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net119	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net119	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	net111	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	net84	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	net88	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net99	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net99	db	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net92	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net88	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net84	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net80	GATE	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net56	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkneg	GATE	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net56	db	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net52	m1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net52	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	net80	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	net92	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	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
+MI652	MOSFET	M0	clkneg	net119	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net119	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	net111	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	net84	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	net88	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net99	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net99	db	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net92	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net88	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net84	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net80	GATE	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/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.spice b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.spice
index a52e99a..b6da345 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.spice
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_lp__dlrtp_lp2 D GATE RESET_B VGND VNB VPB VPWR Q
-M1000 Q a_898_21# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=1.96225e+12p ps=1.204e+07u
-M1001 VPWR a_256_405# a_413_47# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1002 a_1216_57# a_736_47# a_898_21# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1003 VGND RESET_B a_1216_57# VNB nshort w=420000u l=150000u
-+  ad=7.43925e+11p pd=7.27e+06u as=0p ps=0u
-M1004 VGND D a_114_122# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1005 a_740_419# a_27_122# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1006 a_944_419# a_413_47# a_736_47# VPB phighvt w=1e+06u l=250000u
-+  ad=2.5e+11p pd=2.5e+06u as=2.8e+11p ps=2.56e+06u
-M1007 VPWR RESET_B a_898_21# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1008 a_256_405# GATE a_294_185# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1009 VPWR a_898_21# a_944_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_658_47# a_27_122# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1011 a_736_47# a_413_47# a_658_47# VNB nshort w=420000u l=150000u
-+  ad=1.764e+11p pd=1.68e+06u as=0p ps=0u
-M1012 a_1380_57# a_898_21# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1013 Q a_898_21# a_1380_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1014 a_256_405# GATE VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1015 VGND a_898_21# a_850_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1016 a_114_122# D a_27_122# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1017 a_294_185# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_850_47# a_256_405# a_736_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_736_47# a_256_405# a_740_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_898_21# a_736_47# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_500_47# a_256_405# a_413_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1022 VPWR D a_27_122# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1023 VGND a_256_405# a_500_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_658_47# a_413_47# a_736_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_27_122# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_500_47# a_256_405# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_736_47# a_256_405# a_850_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_898_21# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_1216_57# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_898_21# a_1380_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_413_47# a_256_405# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 VPWR a_736_47# a_898_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 VPWR a_898_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 VGND a_27_122# a_658_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR GATE a_256_405# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 a_850_47# a_898_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_413_47# a_256_405# a_500_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_736_47# a_413_47# a_944_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X15 a_294_185# GATE a_256_405# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_898_21# a_736_47# a_1216_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_27_122# D a_114_122# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_740_419# a_256_405# a_736_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X19 VGND GATE a_294_185# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_944_419# a_898_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X21 a_1380_57# a_898_21# Q VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 VPWR a_27_122# a_740_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X23 a_114_122# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.cdl b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.cdl
index 95947e2..2c6b3d0 100644
--- a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.cdl
+++ b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_lp__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.64 l=0.15 mult=1 sa=0.265
+MI635 clkneg 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
+MI648 Q_N net79 VPB pfet_01v8_hvt m=1 w=1.26 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 net79 VPB phighvt m=1 w=1.26 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 net79 m1 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
-MI650 Q m1 VPB phighvt m=1 w=1.26 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.64 l=0.15 mult=1 sa=0.265
+MI17 M0 clkneg 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
-MI18 net51 db 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
-MI653 net59 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.26 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.64 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.42 l=0.15 mult=1 sa=0.265
+MI646 net79 m1 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
-MI647 Q_N net79 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 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
-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=1 w=0.84 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.42 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI633 clkpos GATE_N 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
+MI18 net51 db 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 net59 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net79 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI645 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
+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=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net98 db VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net98 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlxbn_1
diff --git a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.netlist.tsv b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.netlist.tsv
index f48e8eb..0f4d964 100644
--- a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.netlist.tsv
+++ b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_lp__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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net79	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net79	m1	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	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	net59	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net79	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net79	m1	VGND	VNB	nshort	1	0.42	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	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nshort	1	0.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net79	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net79	m1	VPWR	VPB	pfet_01v8_hvt	1	0.64	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.26	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	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	net59	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.26	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.64	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net79	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net79	m1	VGND	VNB	nfet_01v8	1	0.42	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	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	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/dlxbn/sky130_fd_sc_lp__dlxbn_1.spice b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.spice
index 60faf04..bba52ee 100644
--- a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.spice
+++ b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_lp__dlxbn_1 D GATE_N VGND VNB VPB VPWR Q Q_N
-M1000 a_626_47# a_363_483# a_584_483# VPB phighvt w=640000u l=150000u
-+  ad=2.221e+11p pd=2.06e+06u as=1.344e+11p ps=1.7e+06u
-M1001 Q_N a_1069_161# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=1.7874e+12p ps=1.437e+07u
-M1002 a_734_47# a_363_483# a_626_47# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=1.638e+11p ps=1.62e+06u
-M1003 Q a_806_385# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=1.3629e+12p ps=1.092e+07u
-M1004 VGND a_806_385# a_1069_161# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 a_219_135# GATE_N VPWR VPB phighvt w=640000u l=150000u
-+  ad=3.459e+11p pd=2.7e+06u as=0p ps=0u
-M1006 a_764_483# a_219_135# a_626_47# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1007 VGND a_806_385# a_734_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_219_135# GATE_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1009 VPWR a_806_385# a_764_483# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_219_135# a_363_483# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1011 a_626_47# a_219_135# a_554_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1012 VPWR D a_34_407# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1013 Q a_806_385# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1014 VPWR a_219_135# a_363_483# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1015 VGND D a_34_407# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1016 VPWR a_806_385# a_1069_161# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1017 a_806_385# a_626_47# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1018 Q_N a_1069_161# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1019 a_554_47# a_34_407# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_806_385# a_626_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1021 a_584_483# a_34_407# VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR GATE_N a_219_135# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 VGND GATE_N a_219_135# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_363_483# a_219_135# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_1069_161# a_806_385# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_1069_161# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_626_47# a_219_135# a_764_483# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_764_483# a_806_385# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VPWR a_626_47# a_806_385# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_1069_161# a_806_385# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 VPWR a_34_407# a_584_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X10 a_584_483# a_363_483# a_626_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 a_626_47# a_363_483# a_734_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VPWR a_1069_161# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_734_47# a_806_385# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VGND a_806_385# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VPWR a_806_385# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_363_483# a_219_135# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND a_34_407# a_554_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VGND a_626_47# a_806_385# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 a_34_407# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 a_34_407# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_554_47# a_219_135# a_626_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.cdl b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.cdl
index ebc65c7..de1d992 100644
--- a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.cdl
+++ b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_lp__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.64 l=0.15 mult=1 sa=0.265
+MI635 clkneg 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
+MI648 Q_N net79 VPB pfet_01v8_hvt m=2 w=1.26 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 net79 VPB phighvt m=2 w=1.26 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 net79 m1 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
-MI650 Q m1 VPB phighvt m=2 w=1.26 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.64 l=0.15 mult=1 sa=0.265
+MI17 M0 clkneg 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
-MI18 net51 db 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
-MI653 net59 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.26 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.64 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.42 l=0.15 mult=1 sa=0.265
+MI646 net79 m1 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
-MI647 Q_N net79 VNB nshort 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=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
-MI645 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
-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=1 w=0.84 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.42 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=2 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI633 clkpos GATE_N 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
+MI18 net51 db 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 net59 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net79 VNB nfet_01v8 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 nfet_01v8 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
-MI19 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI645 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
+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=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net98 db VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net98 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlxbn_2
diff --git a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.netlist.tsv b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.netlist.tsv
index e6f0fef..c2a6eee 100644
--- a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.netlist.tsv
+++ b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_lp__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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net79	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net79	m1	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	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	net59	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net79	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net79	m1	VGND	VNB	nshort	1	0.42	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	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nshort	1	0.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net79	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net79	m1	VPWR	VPB	pfet_01v8_hvt	1	0.64	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.26	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	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	net59	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.26	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.64	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net79	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net79	m1	VGND	VNB	nfet_01v8	1	0.42	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	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	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/dlxbn/sky130_fd_sc_lp__dlxbn_2.spice b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.spice
index 8abc894..c225ee0 100644
--- a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.spice
+++ b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_lp__dlxbn_2 D GATE_N VGND VNB VPB VPWR Q Q_N
-M1000 VPWR a_214_136# a_354_47# VPB phighvt w=640000u l=150000u
-+  ad=2.3303e+12p pd=1.783e+07u as=1.696e+11p ps=1.81e+06u
-M1001 a_547_47# a_45_136# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.7475e+12p ps=1.394e+07u
-M1002 a_737_47# a_354_47# a_619_47# VNB nshort w=420000u l=150000u
-+  ad=1.428e+11p pd=1.52e+06u as=1.877e+11p ps=1.74e+06u
-M1003 VPWR a_1138_153# Q_N VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1004 Q a_805_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1005 VPWR a_805_21# a_769_491# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1006 a_769_491# a_214_136# a_619_47# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.221e+11p ps=2.06e+06u
-M1007 VGND a_1138_153# Q_N VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1008 Q a_805_21# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1009 VPWR a_805_21# a_1138_153# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1010 VGND a_214_136# a_354_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1011 VPWR D a_45_136# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.048e+11p ps=1.92e+06u
-M1012 a_805_21# a_619_47# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1013 a_214_136# GATE_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1014 VGND D a_45_136# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1015 Q_N a_1138_153# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_805_21# a_619_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1017 VGND a_805_21# a_737_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_805_21# a_1138_153# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1019 a_214_136# GATE_N VPWR VPB phighvt w=640000u l=150000u
-+  ad=3.459e+11p pd=2.7e+06u as=0p ps=0u
-M1020 a_619_47# a_354_47# a_589_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.7e+06u
-M1021 VPWR a_805_21# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_619_47# a_214_136# a_547_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_589_491# a_45_136# VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Q_N a_1138_153# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_805_21# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_805_21# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_769_491# a_805_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VGND a_1138_153# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 Q_N a_1138_153# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_589_491# a_354_47# a_619_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 VPWR a_619_47# a_805_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND a_45_136# a_547_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_45_136# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_805_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_547_47# a_214_136# a_619_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 Q a_805_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_354_47# a_214_136# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 a_45_136# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 a_1138_153# a_805_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 Q a_805_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VGND GATE_N a_214_136# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VPWR a_1138_153# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_354_47# a_214_136# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_619_47# a_354_47# a_737_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_619_47# a_214_136# a_769_491# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 a_1138_153# a_805_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 VPWR GATE_N a_214_136# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 VPWR a_45_136# a_589_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X23 Q_N a_1138_153# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 VGND a_619_47# a_805_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 a_737_47# a_805_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.cdl b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.cdl
index 1481464..7dca878 100644
--- a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.cdl
+++ b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_lp__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.64 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg 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
+MI648 Q_N net79 VPB pfet_01v8_hvt m=1 w=1.26 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 net79 VPB phighvt m=1 w=1.26 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 net79 m1 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
-MI650 Q m1 VPB phighvt m=1 w=1.26 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.64 l=0.15 mult=1 sa=0.265
+MI17 M0 clkneg 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
-MI18 net51 db 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
-MI653 net59 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.26 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.64 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.42 l=0.15 mult=1 sa=0.265
+MI646 net79 m1 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
-MI647 Q_N net79 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 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
-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=1 w=0.84 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.42 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI633 clkneg GATE 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
+MI18 net51 db 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 net59 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkneg GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net79 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI645 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
+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=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net98 db 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net98 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlxbp_1
diff --git a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.netlist.tsv b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.netlist.tsv
index 71af36a..52cc051 100644
--- a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.netlist.tsv
+++ b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_lp__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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net79	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net79	m1	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	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	net59	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net79	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net79	m1	VGND	VNB	nshort	1	0.42	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	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nshort	1	0.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net79	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net79	m1	VPWR	VPB	pfet_01v8_hvt	1	0.64	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.26	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	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	net59	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.26	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net79	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net79	m1	VGND	VNB	nfet_01v8	1	0.42	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	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	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/dlxbp/sky130_fd_sc_lp__dlxbp_1.spice b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.spice
index c403423..7c55b72 100644
--- a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.spice
+++ b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_lp__dlxbp_1 D GATE VGND VNB VPB VPWR Q Q_N
-M1000 Q_N a_1266_147# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=1.6405e+12p ps=1.405e+07u
-M1001 VGND a_758_359# a_748_47# VNB nshort w=420000u l=150000u
-+  ad=1.0458e+12p pd=1.011e+07u as=8.82e+10p ps=1.26e+06u
-M1002 VPWR D a_46_62# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1003 a_608_491# a_367_491# a_568_47# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=8.82e+10p ps=1.26e+06u
-M1004 VGND a_758_359# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1005 a_536_491# a_46_62# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1006 VPWR a_758_359# a_713_491# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=9.45e+10p ps=1.29e+06u
-M1007 a_568_47# a_46_62# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_215_62# GATE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1009 a_758_359# a_608_491# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1010 VPWR a_215_62# a_367_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1011 a_713_491# a_367_491# a_608_491# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.158e+11p ps=2.03e+06u
-M1012 a_1266_147# a_758_359# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1013 VGND a_215_62# a_367_491# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1014 Q_N a_1266_147# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1015 a_748_47# a_215_62# a_608_491# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1266_147# a_758_359# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1017 VPWR a_758_359# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1018 a_758_359# a_608_491# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1019 a_608_491# a_215_62# a_536_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_215_62# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1021 VGND D a_46_62# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 a_367_491# a_215_62# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_748_47# a_758_359# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_758_359# a_1266_147# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 VGND a_1266_147# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_608_491# a_367_491# a_713_491# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VPWR GATE a_215_62# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 a_608_491# a_215_62# a_748_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_713_491# a_758_359# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_536_491# a_215_62# a_608_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 a_46_62# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND a_46_62# a_568_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 Q a_758_359# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_46_62# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 Q a_758_359# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 VPWR a_1266_147# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VGND GATE a_215_62# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VGND a_608_491# a_758_359# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 VPWR a_46_62# a_536_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 a_367_491# a_215_62# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 a_568_47# a_367_491# a_608_491# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VPWR a_608_491# a_758_359# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 VGND a_758_359# a_1266_147# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.cdl b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.cdl
index b7c1595..b0c31a4 100644
--- a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.cdl
+++ b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.cdl
@@ -16,76 +16,76 @@
 
 .SUBCKT sky130_fd_sc_lp__dlxbp_lp 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.64 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg 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
+MI648 Q_N net79 VPB pfet_01v8_hvt m=1 w=1.26 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 net79 VPB phighvt m=1 w=1.26 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=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 net053 m1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI646 net79 m1 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
-MI650 Q m1 VPB phighvt m=1 w=1.26 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.64 l=0.15 mult=1 sa=0.265
+MI17 M0 clkneg 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
-MI32 net042 net79 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MI29 net053 m1 VPB pfet_01v8_hvt m=1 w=1.26 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=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 net59 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.26 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.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 net046 m1 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
-MI27 net077 M0 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net062 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
-MI22 net066 clkneg VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI646 net79 m1 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
-MI21 net070 GATE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265
+MI633 clkneg GATE 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
-MI647 Q_N net79 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net0125 m1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI645 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
-MI28 net0161 M0 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-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=1 w=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 net0153 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI32 net042 net79 VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nshort m=1 w=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 net98 db VNB nshort m=1 w=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 net0177 net79 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI18 net51 db 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 net0173 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 net0157 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 net59 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
-MI23 net0181 GATE VNB nshort m=1 w=0.42 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
+MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 net046 m1 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 net077 M0 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net062 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
+MI22 net066 clkneg 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
+MI21 net070 GATE 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 clkneg GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net79 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net0125 m1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI645 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
+MI28 net0161 M0 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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=1 w=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 net0153 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
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net98 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 net0177 net79 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net0173 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 net0157 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
+MI23 net0181 GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlxbp_lp
diff --git a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.netlist.tsv b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.netlist.tsv
index 3803bda..7a79ead 100644
--- a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.netlist.tsv
+++ b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.netlist.tsv
@@ -1,38 +1,38 @@
 sky130_fd_sc_lp__dlxbp_lp	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	net066	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	Q_N	net79	net042	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	net053	m1	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net79	m1	net046	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	net053	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	net070	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net042	net79	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	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	net59	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	net077	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	net062	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	net046	m1	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net077	M0	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net062	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net066	clkneg	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net070	GATE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	net0181	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net79	net0177	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	net0125	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net0125	m1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net79	m1	net0173	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	net0161	M0	VGND	VNB	nshort	1	0.84	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	net0161	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net0153	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	net0157	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	net0153	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net0177	net79	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net0173	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	net0157	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net0181	GATE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	net066	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net79	net042	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	net053	m1	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net79	m1	net046	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	net053	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkneg	GATE	net070	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net042	net79	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	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	net59	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	net077	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	net062	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	net046	m1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net077	M0	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net062	D	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net066	clkneg	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net070	GATE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	net0181	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net79	net0177	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	net0125	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net0125	m1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net79	m1	net0173	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	net0161	M0	VGND	VNB	nfet_01v8	1	0.84	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	net0161	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net0153	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	net0157	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	net0153	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net0177	net79	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net0173	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	net0157	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net0181	GATE	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/dlxbp/sky130_fd_sc_lp__dlxbp_lp.spice b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.spice
index 52e397b..14b16c8 100644
--- a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.spice
+++ b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_lp__dlxbp_lp D GATE VGND VNB VPB VPWR Q Q_N
-M1000 a_1597_361# a_969_407# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=1.6753e+12p ps=1.397e+07u
-M1001 VGND a_969_407# a_900_47# VNB nshort w=420000u l=150000u
-+  ad=1.0794e+12p pd=1.015e+07u as=1.638e+11p ps=1.62e+06u
-M1002 VGND a_969_407# a_1403_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=2.1e+06u
-M1003 a_1662_131# a_969_407# a_1597_361# VPB phighvt w=640000u l=150000u
-+  ad=1.76e+11p pd=1.83e+06u as=0p ps=0u
-M1004 a_1863_367# a_1662_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1005 VPWR a_969_407# a_927_519# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1006 Q_N a_1662_131# a_1863_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.402e+11p pd=3.06e+06u as=0p ps=0u
-M1007 a_556_47# a_350_111# a_469_47# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1008 VGND a_350_111# a_556_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_720_47# a_27_111# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1010 VGND D a_114_111# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1011 a_272_111# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1012 a_567_475# a_350_111# a_469_47# VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=1.76e+11p ps=1.83e+06u
-M1013 a_741_475# a_27_111# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1014 a_969_407# a_798_47# a_1152_361# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.465e+11p pd=3.07e+06u as=2.646e+11p ps=2.94e+06u
-M1015 VPWR a_350_111# a_567_475# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_969_407# a_1418_361# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=2.646e+11p ps=2.94e+06u
-M1017 a_798_47# a_350_111# a_741_475# VPB phighvt w=640000u l=150000u
-+  ad=2.254e+11p pd=2.06e+06u as=0p ps=0u
-M1018 a_1418_361# a_969_407# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.465e+11p ps=3.07e+06u
-M1019 a_798_47# a_469_47# a_720_47# VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1020 a_900_47# a_350_111# a_798_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_114_111# D a_27_111# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1022 a_969_407# a_798_47# a_1133_47# VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=1.764e+11p ps=2.1e+06u
-M1023 a_350_111# GATE a_278_481# VPB phighvt w=640000u l=150000u
-+  ad=4.904e+11p pd=3.78e+06u as=1.344e+11p ps=1.7e+06u
-M1024 a_1662_131# a_969_407# a_1584_131# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.008e+11p ps=1.32e+06u
-M1025 a_278_481# GATE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1152_361# a_798_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1860_53# a_1662_131# VGND VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1028 VPWR D a_112_481# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.7e+06u
-M1029 a_927_519# a_469_47# a_798_47# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Q_N a_1662_131# a_1860_53# VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1031 a_1133_47# a_798_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_112_481# D a_27_111# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.76e+11p ps=1.83e+06u
-M1033 a_350_111# GATE a_272_111# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1034 a_1403_47# a_969_407# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.25e+06u
-M1035 a_1584_131# a_969_407# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_112_481# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 VPWR a_798_47# a_1152_361# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_469_47# a_350_111# a_567_475# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_567_475# a_350_111# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 a_798_47# a_350_111# a_900_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_798_47# a_1133_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_27_111# D a_112_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 Q a_969_407# a_1403_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_1133_47# a_798_47# a_969_407# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_469_47# a_350_111# a_556_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VPWR a_969_407# a_1597_361# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 a_1597_361# a_969_407# a_1662_131# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 a_720_47# a_469_47# a_798_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_114_111# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VPWR a_1662_131# a_1863_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_1863_367# a_1662_131# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_27_111# D a_114_111# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 Q a_969_407# a_1418_361# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VGND a_27_111# a_720_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_927_519# a_969_407# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 a_900_47# a_969_407# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_741_475# a_350_111# a_798_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 a_1152_361# a_798_47# a_969_407# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 VGND GATE a_272_111# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_1860_53# a_1662_131# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 VGND a_969_407# a_1584_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VPWR GATE a_278_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X27 a_1418_361# a_969_407# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 VPWR a_27_111# a_741_475# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X29 a_1403_47# a_969_407# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X30 a_798_47# a_469_47# a_927_519# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X31 a_272_111# GATE a_350_111# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 a_556_47# a_350_111# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 a_1584_131# a_969_407# a_1662_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_278_481# GATE a_350_111# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X35 VGND a_1662_131# a_1860_53# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.cdl b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.cdl
index f3013cd..b711187 100644
--- a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.cdl
+++ b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.cdl
@@ -16,62 +16,62 @@
 
 .SUBCKT sky130_fd_sc_lp__dlxbp_lp2 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
-MI648 Q_N net133 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 M0 clkneg 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
-MI646 net133 m1 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
-MI650 Q m1 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
-MI18 net61 db 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
-MI653 net57 m1 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
-MI651 M0 clkpos 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
-MI655 m1 M0 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
-MI25 db D 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
-MI22 clkpos clkneg 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
-MI21 clkneg GATE 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
-MI634 clkneg GATE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI648 Q_N net133 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
-MI647 Q_N net133 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 Q m1 VNB nshort m=1 w=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 net137 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
-MI645 net133 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
-MI28 net116 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
-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 net124 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI26 net113 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI17 M0 clkneg 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
-MI637 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
-MI19 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
-MI20 net100 db VNB nshort m=1 w=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 net144 net133 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI646 net133 m1 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
-MI33 net132 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 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
-MI24 net108 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI18 net61 db 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
-MI23 net81 GATE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 net57 m1 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
+MI651 M0 clkpos 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
+MI655 m1 M0 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
+MI25 db D 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
+MI22 clkpos clkneg 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
+MI21 clkneg GATE 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
+MI634 clkneg GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 Q_N net133 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI30 net137 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
+MI645 net133 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
+MI28 net116 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 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 net124 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI26 net113 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
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net100 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 net144 net133 VNB nfet_01v8 m=1 w=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 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
+MI24 net108 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
+MI23 net81 GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlxbp_lp2
diff --git a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.netlist.tsv b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.netlist.tsv
index 50f40e0..7cd973c 100644
--- a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.netlist.tsv
+++ b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.netlist.tsv
@@ -1,31 +1,31 @@
 sky130_fd_sc_lp__dlxbp_lp2	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
-MI648	MOSFET	Q_N	net133	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net61	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI646	MOSFET	net133	m1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net61	db	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net57	m1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net57	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	db	D	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	clkneg	GATE	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	net81	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	Q_N	net133	net144	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	net137	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net137	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	net133	m1	net132	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	net116	M0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	M0	clkneg	net124	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net124	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	net116	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net113	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	net108	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	net113	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net100	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net100	db	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net144	net133	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net132	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	net108	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net81	GATE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	Q_N	net133	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net61	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI646	MOSFET	net133	m1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net61	db	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net57	m1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net57	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	clkneg	GATE	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	net81	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	Q_N	net133	net144	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	net137	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net137	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	net133	m1	net132	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	net116	M0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M0	clkneg	net124	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net124	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	net116	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net113	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	net108	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	net113	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net100	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net100	db	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net144	net133	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net132	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	net108	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net81	GATE	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/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.spice b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.spice
index 4cd413f..b08b7a3 100644
--- a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.spice
+++ b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.spice
@@ -16,62 +16,33 @@
 
 
 .subckt sky130_fd_sc_lp__dlxbp_lp2 D GATE VGND VNB VPB VPWR Q Q_N
-M1000 VGND D a_114_57# VNB nshort w=420000u l=150000u
-+  ad=8.379e+11p pd=8.19e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VPWR a_934_29# a_978_393# VPB phighvt w=1e+06u l=250000u
-+  ad=2.04575e+12p pd=1.475e+07u as=3.2e+11p ps=2.64e+06u
-M1002 a_1432_57# a_934_29# Q VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1003 a_548_55# a_278_409# a_461_55# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1004 a_1590_57# a_934_29# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1005 a_278_409# GATE VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1006 a_706_55# a_27_57# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1007 a_784_55# a_461_55# a_706_55# VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1008 a_1662_57# a_934_29# a_1590_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1009 a_784_55# a_278_409# a_717_393# VPB phighvt w=1e+06u l=250000u
-+  ad=5.65e+11p pd=3.13e+06u as=2.4e+11p ps=2.48e+06u
-M1010 VPWR a_934_29# Q VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1011 a_114_57# D a_27_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1012 a_278_409# GATE a_278_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1013 a_886_55# a_278_409# a_784_55# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1014 VGND a_934_29# a_886_55# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1860_92# a_1662_57# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1016 a_978_393# a_461_55# a_784_55# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Q_N a_1662_57# a_1860_92# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1018 VPWR D a_27_57# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1019 VPWR a_278_409# a_461_55# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1020 VGND a_278_409# a_548_55# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_278_57# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1162_55# a_784_55# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1023 a_934_29# a_784_55# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1024 a_934_29# a_784_55# a_1162_55# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1025 VGND a_934_29# a_1432_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1662_57# a_934_29# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1027 a_717_393# a_27_57# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Q_N a_1662_57# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
+X0 a_978_393# a_934_29# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 VPWR a_784_55# a_934_29# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 VGND GATE a_278_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_461_55# a_278_409# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_886_55# a_934_29# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_1860_92# a_1662_57# Q_N VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_27_57# a_717_393# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 Q a_934_29# a_1432_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR GATE a_278_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 VPWR a_934_29# a_1662_57# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 a_1162_55# a_784_55# a_934_29# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_1432_57# a_934_29# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_717_393# a_278_409# a_784_55# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X13 VGND a_934_29# a_1590_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_706_55# a_461_55# a_784_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_278_57# GATE a_278_409# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 Q a_934_29# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X17 VGND a_1662_57# a_1860_92# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_548_55# a_278_409# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_784_55# a_278_409# a_886_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_461_55# a_278_409# a_548_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 VGND a_784_55# a_1162_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_114_57# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_27_57# D a_114_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VGND a_27_57# a_706_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_784_55# a_461_55# a_978_393# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X26 a_27_57# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X27 VPWR a_1662_57# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X28 a_1590_57# a_934_29# a_1662_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.cdl b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.cdl
index d8f6e45..ead0c81 100644
--- a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.cdl
+++ b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.cdl
@@ -16,40 +16,40 @@
 
 .SUBCKT sky130_fd_sc_lp__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.64 l=0.15 mult=1 sa=0.265
+MI635 clkneg 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
+MI17 M0 clkneg 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
-MI17 M0 clkneg 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
-MI650 Q m1 VPB phighvt m=1 w=1.26 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.64 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=1 w=1.26 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=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 net59 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.26 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.64 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.42 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N 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
+MI18 net51 db 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
-MI649 Q m1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-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=1 w=0.84 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.42 l=0.15 mult=1 sa=0.265
+MI653 net59 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.42 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nshort m=1 w=0.42 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 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=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net98 db VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net98 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlxtn_1
diff --git a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.netlist.tsv b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.netlist.tsv
index 752bc6e..e959b36 100644
--- a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.netlist.tsv
+++ b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.netlist.tsv
@@ -1,20 +1,20 @@
 sky130_fd_sc_lp__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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	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	net59	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	1	0.84	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	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nshort	1	0.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	0.64	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.26	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	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	net59	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.26	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.64	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	1	0.84	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	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	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/dlxtn/sky130_fd_sc_lp__dlxtn_1.spice b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.spice
index 29b957b..b259b38 100644
--- a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.spice
+++ b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_lp__dlxtn_1 D GATE_N VGND VNB VPB VPWR Q
-M1000 VPWR a_228_129# a_342_481# VPB phighvt w=640000u l=150000u
-+  ad=1.5034e+12p pd=1.167e+07u as=1.696e+11p ps=1.81e+06u
-M1001 VPWR D a_59_129# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1002 a_764_481# a_228_129# a_656_481# VPB phighvt w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=2.221e+11p ps=2.06e+06u
-M1003 a_656_47# a_59_129# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=7.266e+11p ps=7.44e+06u
-M1004 a_228_129# GATE_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1005 a_228_129# GATE_N VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1006 Q a_842_413# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1007 VPWR a_842_413# a_764_481# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_836_47# a_342_481# a_656_481# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=1.638e+11p ps=1.62e+06u
-M1009 VGND D a_59_129# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1010 a_842_413# a_656_481# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1011 VGND a_228_129# a_342_481# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1012 a_584_481# a_59_129# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1013 a_656_481# a_342_481# a_584_481# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_842_413# a_836_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Q a_842_413# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1016 a_656_481# a_228_129# a_656_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_842_413# a_656_481# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
+X0 VPWR a_842_413# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_656_47# a_228_129# a_656_481# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND GATE_N a_228_129# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR GATE_N a_228_129# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 VPWR a_656_481# a_842_413# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND a_656_481# a_842_413# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VGND a_842_413# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_342_481# a_228_129# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 a_342_481# a_228_129# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_656_481# a_342_481# a_836_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_764_481# a_842_413# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_836_47# a_842_413# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_59_129# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 a_656_481# a_228_129# a_764_481# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 VPWR a_59_129# a_584_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X15 a_584_481# a_342_481# a_656_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X16 VGND a_59_129# a_656_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_59_129# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.cdl b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.cdl
index 0637600..1505b1d 100644
--- a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.cdl
+++ b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.cdl
@@ -16,40 +16,40 @@
 
 .SUBCKT sky130_fd_sc_lp__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.64 l=0.15 mult=1 sa=0.265
+MI635 clkneg 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
+MI17 M0 clkneg 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
-MI17 M0 clkneg 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
-MI650 Q m1 VPB phighvt m=2 w=1.26 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.64 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=2 w=1.26 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=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 net59 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.26 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.64 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.42 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N 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
+MI18 net51 db 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
-MI649 Q m1 VNB nshort 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
-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=1 w=0.84 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.42 l=0.15 mult=1 sa=0.265
+MI653 net59 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.42 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 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
-MI19 M0 clkpos VNB nshort m=1 w=0.42 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 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=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net98 db VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net98 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlxtn_2
diff --git a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.netlist.tsv b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.netlist.tsv
index b735400..a640541 100644
--- a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.netlist.tsv
+++ b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.netlist.tsv
@@ -1,20 +1,20 @@
 sky130_fd_sc_lp__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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	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	net59	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	2	0.84	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	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nshort	1	0.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	0.64	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.26	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	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	net59	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.26	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.64	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	2	0.84	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	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	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/dlxtn/sky130_fd_sc_lp__dlxtn_2.spice b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.spice
index 99651b2..bf0a057 100644
--- a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.spice
+++ b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__dlxtn_2 D GATE_N VGND VNB VPB VPWR Q
-M1000 a_849_419# a_663_481# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=1.8625e+12p ps=1.476e+07u
-M1001 VGND a_849_419# Q VNB nshort w=840000u l=150000u
-+  ad=9.912e+11p pd=9.85e+06u as=2.352e+11p ps=2.24e+06u
-M1002 a_242_130# GATE_N VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1003 a_771_481# a_242_130# a_663_481# VPB phighvt w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=2.221e+11p ps=2.06e+06u
-M1004 a_849_47# a_349_481# a_663_481# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=1.638e+11p ps=1.62e+06u
-M1005 a_849_419# a_663_481# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1006 VGND a_242_130# a_349_481# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 VGND D a_57_130# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1008 VGND a_849_419# a_849_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Q a_849_419# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR D a_57_130# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1011 VPWR a_242_130# a_349_481# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1012 VPWR a_849_419# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1013 VPWR a_849_419# a_771_481# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_663_481# a_242_130# a_669_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1015 a_591_481# a_57_130# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1016 a_663_481# a_349_481# a_591_481# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_242_130# GATE_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1018 Q a_849_419# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_669_47# a_57_130# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_663_481# a_849_419# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VPWR GATE_N a_242_130# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_771_481# a_849_419# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VPWR a_663_481# a_849_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_669_47# a_242_130# a_663_481# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_849_419# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_663_481# a_242_130# a_771_481# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VPWR a_57_130# a_591_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 VGND GATE_N a_242_130# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_591_481# a_349_481# a_663_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X10 a_349_481# a_242_130# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_663_481# a_349_481# a_849_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 Q a_849_419# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_849_47# a_849_419# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 Q a_849_419# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VPWR a_849_419# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_349_481# a_242_130# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X17 a_57_130# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_57_130# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 VGND a_57_130# a_669_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.cdl b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.cdl
index 0c351f5..641f8b9 100644
--- a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.cdl
+++ b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.cdl
@@ -16,40 +16,40 @@
 
 .SUBCKT sky130_fd_sc_lp__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.64 l=0.15 mult=1 sa=0.265
+MI635 clkneg 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
+MI17 M0 clkneg 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
-MI17 M0 clkneg 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
-MI650 Q m1 VPB phighvt m=4 w=1.26 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.64 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=4 w=1.26 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=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 net59 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.26 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.64 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.42 l=0.15 mult=1 sa=0.265
+MI633 clkpos GATE_N 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
+MI18 net51 db 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
-MI649 Q m1 VNB nshort m=4 w=0.84 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=1 w=0.84 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.42 l=0.15 mult=1 sa=0.265
+MI653 net59 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.42 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkpos GATE_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 m=4 w=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 M0 clkpos VNB nshort m=1 w=0.42 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 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=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net98 db VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI636 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net98 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlxtn_4
diff --git a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.netlist.tsv b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.netlist.tsv
index c6ffb95..3ca9ce3 100644
--- a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.netlist.tsv
+++ b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.netlist.tsv
@@ -1,20 +1,20 @@
 sky130_fd_sc_lp__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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkpos	GATE_N	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	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	net59	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkpos	GATE_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	4	0.84	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	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nshort	1	0.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	0.64	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.26	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	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	net59	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.26	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.64	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	4	0.84	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	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	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/dlxtn/sky130_fd_sc_lp__dlxtn_4.spice b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.spice
index e7b8990..7e666c7 100644
--- a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.spice
+++ b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_lp__dlxtn_4 D GATE_N VGND VNB VPB VPWR Q
-M1000 VGND a_795_423# Q VNB nshort w=840000u l=150000u
-+  ad=1.2012e+12p pd=1.197e+07u as=4.704e+11p ps=4.48e+06u
-M1001 VPWR a_795_423# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.0957e+12p pd=1.745e+07u as=7.056e+11p ps=6.16e+06u
-M1002 a_795_423# a_609_485# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1003 a_200_481# GATE_N VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1004 a_537_485# a_27_481# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1005 a_717_485# a_200_481# a_609_485# VPB phighvt w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=2.221e+11p ps=2.06e+06u
-M1006 Q a_795_423# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND D a_27_481# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1008 a_200_481# GATE_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1009 a_574_47# a_27_481# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1010 VGND a_795_423# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Q a_795_423# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_609_485# a_200_481# a_574_47# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1013 VPWR a_795_423# a_717_485# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_200_481# a_310_485# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1015 a_754_47# a_310_485# a_609_485# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1016 Q a_795_423# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR D a_27_481# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1018 Q a_795_423# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_795_423# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_609_485# a_310_485# a_537_485# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_795_423# a_609_485# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1022 VGND a_795_423# a_754_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND a_200_481# a_310_485# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 VGND a_609_485# a_795_423# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_574_47# a_200_481# a_609_485# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_609_485# a_310_485# a_754_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_27_481# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 VGND GATE_N a_200_481# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR a_795_423# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_754_47# a_795_423# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_795_423# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VPWR a_609_485# a_795_423# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR GATE_N a_200_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X10 a_310_485# a_200_481# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR a_27_481# a_537_485# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 VGND a_27_481# a_574_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 Q a_795_423# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 Q a_795_423# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VGND a_795_423# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_310_485# a_200_481# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X17 a_27_481# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 Q a_795_423# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 a_717_485# a_795_423# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 Q a_795_423# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 VPWR a_795_423# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 a_609_485# a_200_481# a_717_485# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X23 a_537_485# a_310_485# a_609_485# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.cdl b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.cdl
index 2594c49..f9bb8b9 100644
--- a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.cdl
+++ b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.cdl
@@ -16,40 +16,40 @@
 
 .SUBCKT sky130_fd_sc_lp__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.64 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg 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
+MI17 M0 clkneg 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
-MI17 M0 clkneg 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
-MI650 Q m1 VPB phighvt m=1 w=1.26 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.64 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=1 w=1.26 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=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 net59 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.26 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.64 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.42 l=0.15 mult=1 sa=0.265
+MI633 clkneg GATE 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
-MI649 Q m1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-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=1 w=0.84 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.42 l=0.15 mult=1 sa=0.265
+MI18 net51 db 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 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI653 net59 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI638 db D VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 clkneg GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nshort m=1 w=0.42 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 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=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net98 db 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net98 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlxtp_1
diff --git a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.netlist.tsv b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.netlist.tsv
index a78ab88..53e3d49 100644
--- a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.netlist.tsv
+++ b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.netlist.tsv
@@ -1,20 +1,20 @@
 sky130_fd_sc_lp__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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	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	net59	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	VGND	VNB	nshort	1	0.84	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	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nshort	1	0.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	0.64	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.26	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	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	net59	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.26	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	VGND	VNB	nfet_01v8	1	0.84	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	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	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/dlxtp/sky130_fd_sc_lp__dlxtp_1.spice b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.spice
index 5791bcb..6456db8 100644
--- a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.spice
+++ b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_lp__dlxtp_1 D GATE VGND VNB VPB VPWR Q
-M1000 VPWR a_196_425# a_317_461# VPB phighvt w=640000u l=150000u
-+  ad=1.2717e+12p pd=1.084e+07u as=1.696e+11p ps=1.81e+06u
-M1001 VGND a_196_425# a_317_461# VNB nshort w=420000u l=150000u
-+  ad=7.329e+11p pd=7.47e+06u as=1.113e+11p ps=1.37e+06u
-M1002 VGND a_733_99# a_691_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1003 a_530_125# a_27_425# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 a_701_419# a_317_461# a_596_419# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.158e+11p ps=2.03e+06u
-M1005 a_691_125# a_196_425# a_596_419# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.239e+11p ps=1.43e+06u
-M1006 VPWR a_733_99# a_701_419# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR D a_27_425# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1008 VGND D a_27_425# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1009 a_196_425# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1010 a_524_419# a_27_425# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1011 Q a_733_99# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1012 a_596_419# a_196_425# a_524_419# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_733_99# a_596_419# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1014 Q a_733_99# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1015 a_196_425# GATE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1016 a_733_99# a_596_419# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1017 a_596_419# a_317_461# a_530_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR GATE a_196_425# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 VPWR a_596_419# a_733_99# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR a_733_99# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_27_425# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 a_317_461# a_196_425# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_27_425# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_596_419# a_317_461# a_701_419# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_701_419# a_733_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VGND a_596_419# a_733_99# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_691_125# a_733_99# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_317_461# a_196_425# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 VGND a_733_99# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VPWR a_27_425# a_524_419# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 a_524_419# a_196_425# a_596_419# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 VGND a_27_425# a_530_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_596_419# a_196_425# a_691_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VGND GATE a_196_425# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_530_125# a_317_461# a_596_419# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.cdl b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.cdl
index 4839881..f12c34d 100644
--- a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.cdl
+++ b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_lp__dlxtp_lp 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.64 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg 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
+MI17 M0 clkneg 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
-MI17 M0 clkneg 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
-MI650 Q m1 VPB phighvt m=1 w=1.26 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.64 l=0.15 mult=1 sa=0.265
+MI650 Q m1 VPB pfet_01v8_hvt m=1 w=1.26 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=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 net59 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.26 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.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI29 net035 m1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net062 M0 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 net047 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
-MI22 net086 clkneg VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI633 clkneg GATE 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
-MI21 net078 GATE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI18 net51 db 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 clkneg GATE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 net59 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
-MI649 Q m1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 net0111 GATE VNB nshort m=1 w=0.42 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
-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=1 w=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 net0103 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI655 m1 M0 VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI638 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
+MI29 net035 m1 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net062 M0 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net047 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
+MI22 net086 clkneg 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
+MI21 net078 GATE 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 clkneg GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q m1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 M0 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI23 net0111 GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 net98 db VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI26 net0103 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
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI30 net094 m1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI19 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
+MI20 net98 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI28 net099 M0 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 net0126 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI30 net094 m1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI28 net099 M0 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 net0126 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_lp__dlxtp_lp
diff --git a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.netlist.tsv b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.netlist.tsv
index d815c78..f23ae69 100644
--- a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.netlist.tsv
+++ b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_lp__dlxtp_lp	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	net086	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	M0	clkneg	net51	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	net035	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	clkneg	GATE	net078	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net51	db	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net59	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	net59	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	net062	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	net047	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	net035	m1	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net062	M0	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net047	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net086	clkneg	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net078	GATE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	net0111	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	net094	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net0111	GATE	VGND	VNB	nshort	1	0.42	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	net099	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net0103	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	net0126	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	net0103	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net98	db	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net094	m1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	net099	M0	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	net0126	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	net086	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	M0	clkneg	net51	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	net035	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	clkneg	GATE	net078	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net51	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net59	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	net59	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	net062	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	db	D	net047	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	net035	m1	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net062	M0	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net047	D	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net086	clkneg	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net078	GATE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	net0111	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	net094	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net0111	GATE	VGND	VNB	nfet_01v8	1	0.42	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	net099	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net0103	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	net0126	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	net0103	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net98	db	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net094	m1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	net099	M0	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	net0126	clkneg	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/dlxtp/sky130_fd_sc_lp__dlxtp_lp.spice b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.spice
index 771cb27..22b8436 100644
--- a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.spice
+++ b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_lp__dlxtp_lp D GATE VGND VNB VPB VPWR Q
-M1000 VPWR GATE a_114_470# VPB phighvt w=640000u l=150000u
-+  ad=1.3166e+12p pd=1.086e+07u as=1.536e+11p ps=1.76e+06u
-M1001 VGND GATE a_114_102# VNB nshort w=420000u l=150000u
-+  ad=9.072e+11p pd=8.29e+06u as=8.82e+10p ps=1.26e+06u
-M1002 VGND a_27_102# a_584_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1003 a_584_47# a_27_102# a_463_491# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1004 a_824_491# a_463_491# a_790_47# VNB nshort w=420000u l=150000u
-+  ad=1.764e+11p pd=1.68e+06u as=1.008e+11p ps=1.32e+06u
-M1005 VGND a_1027_407# a_982_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1006 a_1474_367# a_1027_407# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1007 Q a_1027_407# a_1474_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1008 a_933_535# a_463_491# a_824_491# VPB phighvt w=420000u l=150000u
-+  ad=1.974e+11p pd=1.78e+06u as=2.286e+11p ps=2.07e+06u
-M1009 a_982_47# a_27_102# a_824_491# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_114_102# GATE a_27_102# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1011 a_1204_367# a_824_491# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1012 a_278_102# D VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1013 a_1027_407# a_824_491# a_1204_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1014 a_746_491# a_350_102# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1015 a_1474_53# a_1027_407# VGND VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1016 a_824_491# a_27_102# a_746_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_350_102# D a_278_470# VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=1.344e+11p ps=1.7e+06u
-M1018 Q a_1027_407# a_1474_53# VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1019 a_278_470# D VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_350_102# D a_278_102# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1021 a_550_491# a_27_102# a_463_491# VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.824e+11p ps=1.85e+06u
-M1022 a_114_470# GATE a_27_102# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1023 a_790_47# a_350_102# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_27_102# a_550_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1198_47# a_824_491# VGND VNB nshort w=840000u l=150000u
-+  ad=2.016e+11p pd=2.16e+06u as=0p ps=0u
-M1026 a_1027_407# a_824_491# a_1198_47# VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1027 VPWR a_1027_407# a_933_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_824_491# a_463_491# a_933_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_114_102# GATE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_463_491# a_27_102# a_550_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 VPWR a_350_102# a_746_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 a_746_491# a_27_102# a_824_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_27_102# GATE a_114_102# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR D a_278_470# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 a_1198_47# a_824_491# a_1027_407# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_114_470# GATE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 VGND D a_278_102# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VPWR a_1027_407# a_1474_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_1474_367# a_1027_407# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_463_491# a_27_102# a_584_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_278_470# D a_350_102# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 a_790_47# a_463_491# a_824_491# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VGND a_824_491# a_1198_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_824_491# a_27_102# a_982_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_1474_53# a_1027_407# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_278_102# D a_350_102# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VGND a_350_102# a_790_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_933_535# a_1027_407# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 a_27_102# GATE a_114_470# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 a_982_47# a_1027_407# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VPWR a_824_491# a_1204_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 a_1204_367# a_824_491# a_1027_407# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 a_550_491# a_27_102# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X26 VGND a_1027_407# a_1474_53# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 a_584_47# a_27_102# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.cdl b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.cdl
index 38a3ac1..4d123d5 100644
--- a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.cdl
+++ b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.cdl
@@ -16,50 +16,50 @@
 
 .SUBCKT sky130_fd_sc_lp__dlxtp_lp2 D GATE VGND VNB VPB VPWR Q
 *.PININFO D:I GATE:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI17 M0 clkneg 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
-MI650 Q m1 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
-MI18 net55 db 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
-MI653 net51 m1 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
-MI651 M0 clkpos 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
-MI655 m1 M0 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
-MI25 db D 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
-MI22 clkpos clkneg 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
-MI21 clkneg GATE 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
-MI634 clkneg GATE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI17 M0 clkneg 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
-MI649 Q m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI650 Q m1 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
-MI30 net111 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
-MI28 net94 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
-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=1 w=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 net91 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI18 net55 db 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
-MI637 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
-MI19 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
-MI20 net78 db VNB nshort m=1 w=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 net86 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 net51 m1 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
-MI23 net67 GATE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI651 M0 clkpos 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
+MI655 m1 M0 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
+MI25 db D 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
+MI22 clkpos clkneg 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
+MI21 clkneg GATE 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
+MI634 clkneg GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 Q 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
+MI30 net111 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
+MI28 net94 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 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=1 w=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 net91 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
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI19 M0 clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 net78 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 net86 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
+MI23 net67 GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlxtp_lp2
diff --git a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.netlist.tsv b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.netlist.tsv
index 8b07a38..77afbfe 100644
--- a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.netlist.tsv
+++ b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.netlist.tsv
@@ -1,25 +1,25 @@
 sky130_fd_sc_lp__dlxtp_lp2	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
-MI17	MOSFET	M0	clkneg	net55	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	Q	m1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net55	db	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	net51	m1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	M0	clkpos	net51	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	db	D	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	clkneg	GATE	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	clkneg	GATE	net67	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	Q	m1	net111	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net111	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	net94	M0	VGND	VNB	nshort	1	0.42	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	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net91	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	net86	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	net91	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	M0	clkpos	net78	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net78	db	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	net86	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net67	GATE	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	Q	m1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net55	db	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	net51	m1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	M0	clkpos	net51	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	db	D	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	clkneg	GATE	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	clkneg	GATE	net67	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	Q	m1	net111	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net111	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	net94	M0	VGND	VNB	nfet_01v8	1	0.42	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	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net91	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	net86	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	net91	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	M0	clkpos	net78	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net78	db	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	net86	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net67	GATE	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/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.spice b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.spice
index 698b735..f44894b 100644
--- a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.spice
+++ b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.spice
@@ -16,50 +16,27 @@
 
 
 .subckt sky130_fd_sc_lp__dlxtp_lp2 D GATE VGND VNB VPB VPWR Q
-M1000 a_880_47# a_240_409# a_778_47# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.512e+11p ps=1.56e+06u
-M1001 a_928_21# a_778_47# a_1207_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1002 VGND D a_114_57# VNB nshort w=420000u l=150000u
-+  ad=8.148e+11p pd=7.24e+06u as=8.82e+10p ps=1.26e+06u
-M1003 a_766_419# a_27_57# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=1.8553e+12p ps=1.181e+07u
-M1004 VPWR D a_27_57# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1005 VGND a_928_21# a_880_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_1477_83# a_928_21# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1007 Q a_928_21# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1008 Q a_928_21# a_1477_83# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1009 a_114_57# D a_27_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1010 VGND a_240_409# a_542_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1011 a_272_57# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1012 a_240_409# GATE a_272_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1013 VPWR a_240_409# a_452_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1014 a_240_409# GATE VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1015 a_778_47# a_240_409# a_766_419# VPB phighvt w=1e+06u l=250000u
-+  ad=2.9e+11p pd=2.58e+06u as=0p ps=0u
-M1016 VPWR a_928_21# a_972_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=3.2e+11p ps=2.64e+06u
-M1017 a_542_47# a_240_409# a_452_419# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1018 a_700_47# a_27_57# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1019 a_972_419# a_452_419# a_778_47# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_928_21# a_778_47# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1021 a_778_47# a_452_419# a_700_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1207_47# a_778_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR GATE a_240_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 VPWR a_778_47# a_928_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_452_419# a_240_409# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_972_419# a_928_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 VPWR a_27_57# a_766_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_778_47# a_452_419# a_972_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 VGND a_928_21# a_1477_83# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_1207_47# a_778_47# a_928_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_766_419# a_240_409# a_778_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_27_57# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 a_880_47# a_928_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_272_57# GATE a_240_409# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_778_47# a_240_409# a_880_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_452_419# a_240_409# a_542_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_700_47# a_452_419# a_778_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VGND a_778_47# a_1207_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_542_47# a_240_409# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_114_57# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_27_57# D a_114_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VGND GATE a_272_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VGND a_27_57# a_700_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 VPWR a_928_21# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X22 a_1477_83# a_928_21# Q VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.cdl b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.cdl
index 4037a37..c8bf2b6 100644
--- a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.cdl
+++ b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__dlybuf4s15kapwr_1 A KAPWR VGND VNB VPB VPWR X
 *.PININFO A:I KAPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP1 X Ab VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 net67 A VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net63 net67 VPB pfet_01v8_hvt m=1 w=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 Ab net63 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 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 net67 A VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 net67 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
-MI10 net63 net67 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 Ab net63 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
-MI7 X Ab VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN0 net67 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 net63 net67 VNB nshort m=1 w=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 Ab net63 VNB nshort m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 net63 net67 VNB nfet_01v8 m=1 w=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 Ab net63 VNB nfet_01v8 m=1 w=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_lp__dlybuf4s15kapwr_1
diff --git a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.netlist.tsv b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.netlist.tsv
index 62ebbb9..1b39172 100644
--- a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.netlist.tsv
+++ b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__dlybuf4s15kapwr_1	A:I KAPWR: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
-MMIP1	MOSFET	X	Ab	KAPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	net67	A	KAPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net63	net67	KAPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Ab	net63	KAPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	X	Ab	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	net67	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net63	net67	VGND	VNB	nshort	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Ab	net63	VGND	VNB	nshort	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	KAPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	net67	A	KAPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net63	net67	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Ab	net63	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	X	Ab	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	net67	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net63	net67	VGND	VNB	nfet_01v8	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Ab	net63	VGND	VNB	nfet_01v8	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.spice b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.spice
index cb74733..a54fa05 100644
--- a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.spice
+++ b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__dlybuf4s15kapwr_1 A KAPWR VGND VNB VPB VPWR X
-M1000 X a_394_52# KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=1.55e+12p ps=7.88e+06u
-M1001 a_282_52# a_27_52# VGND VNB nshort w=1e+06u l=150000u
-+  ad=2.65e+11p pd=2.53e+06u as=1.2924e+12p ps=6.84e+06u
-M1002 KAPWR a_282_52# a_394_52# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1003 a_282_52# a_27_52# KAPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1004 VGND A a_27_52# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 X a_394_52# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 VGND a_282_52# a_394_52# VNB nshort w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1007 KAPWR A a_27_52# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 VGND a_27_52# a_282_52# VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=150000u
+X1 a_394_52# a_282_52# VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=150000u
+X2 a_27_52# A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_27_52# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_394_52# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 KAPWR a_394_52# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_394_52# a_282_52# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 KAPWR a_27_52# a_282_52# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.cdl b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.cdl
index 6ebc112..99534b7 100644
--- a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.cdl
+++ b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__dlybuf4s15kapwr_2 A KAPWR VGND VNB VPB VPWR X
 *.PININFO A:I KAPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP1 X Ab VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 net67 A VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net63 net67 VPB pfet_01v8_hvt m=1 w=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 Ab net63 VPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 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 net67 A VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 net67 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
-MI10 net63 net67 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 Ab net63 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
-MI7 X Ab VNB nshort 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
-MMIN0 net67 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 net63 net67 VNB nshort m=1 w=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 Ab net63 VNB nshort m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 net63 net67 VNB nfet_01v8 m=1 w=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 Ab net63 VNB nfet_01v8 m=1 w=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_lp__dlybuf4s15kapwr_2
diff --git a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.netlist.tsv b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.netlist.tsv
index 5d60bcd..9aec0e9 100644
--- a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.netlist.tsv
+++ b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__dlybuf4s15kapwr_2	A:I KAPWR: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
-MMIP1	MOSFET	X	Ab	KAPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	net67	A	KAPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net63	net67	KAPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Ab	net63	KAPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	X	Ab	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	net67	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net63	net67	VGND	VNB	nshort	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Ab	net63	VGND	VNB	nshort	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	KAPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	net67	A	KAPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net63	net67	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Ab	net63	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	X	Ab	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	net67	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net63	net67	VGND	VNB	nfet_01v8	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Ab	net63	VGND	VNB	nfet_01v8	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.spice b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.spice
index b53cff5..4964892 100644
--- a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.spice
+++ b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__dlybuf4s15kapwr_2 A KAPWR VGND VNB VPB VPWR X
-M1000 VGND a_394_52# X VNB nshort w=420000u l=150000u
-+  ad=1.4646e+12p pd=8.5e+06u as=1.176e+11p ps=1.4e+06u
-M1001 X a_394_52# KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=2.0666e+12p ps=1.122e+07u
-M1002 a_282_52# a_27_52# VGND VNB nshort w=1e+06u l=150000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1003 KAPWR a_282_52# a_394_52# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1004 a_282_52# a_27_52# KAPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1005 VGND A a_27_52# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 X a_394_52# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 KAPWR a_394_52# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_282_52# a_394_52# VNB nshort w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1009 KAPWR A a_27_52# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 VGND a_27_52# a_282_52# VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=150000u
+X1 a_394_52# a_282_52# VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=150000u
+X2 a_27_52# A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_27_52# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_394_52# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_394_52# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 KAPWR a_394_52# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_394_52# a_282_52# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X8 X a_394_52# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 KAPWR a_27_52# a_282_52# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.cdl b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.cdl
index 0e22042..db9fd3b 100644
--- a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.cdl
+++ b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__dlybuf4s18kapwr_1 A KAPWR VGND VNB VPB VPWR X
 *.PININFO A:I KAPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP1 X Ab VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 net56 A VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net52 net56 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI12 Ab net52 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 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 net56 A VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 net56 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
-MI10 net52 net56 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 Ab net52 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 X Ab VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN0 net56 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 net52 net56 VNB nshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 Ab net52 VNB nshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI9 net52 net56 VNB nfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 Ab net52 VNB nfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlybuf4s18kapwr_1
diff --git a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.netlist.tsv b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.netlist.tsv
index 073be39..c98eae0 100644
--- a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.netlist.tsv
+++ b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__dlybuf4s18kapwr_1	A:I KAPWR: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
-MMIP1	MOSFET	X	Ab	KAPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	net56	A	KAPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net52	net56	KAPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Ab	net52	KAPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	X	Ab	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	net56	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net52	net56	VGND	VNB	nshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Ab	net52	VGND	VNB	nshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	KAPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	net56	A	KAPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net52	net56	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Ab	net52	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	X	Ab	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	net56	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net52	net56	VGND	VNB	nfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Ab	net52	VGND	VNB	nfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.spice b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.spice
index caf4efa..5fe889f 100644
--- a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.spice
+++ b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__dlybuf4s18kapwr_1 A KAPWR VGND VNB VPB VPWR X
-M1000 a_282_52# a_27_52# KAPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.65e+11p pd=2.53e+06u as=1.49e+12p ps=7.76e+06u
-M1001 X a_394_52# KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1002 KAPWR a_282_52# a_394_52# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1003 a_282_52# a_27_52# VGND VNB nshort w=1e+06u l=180000u
-+  ad=2.65e+11p pd=2.53e+06u as=1.2324e+12p ps=6.72e+06u
-M1004 VGND A a_27_52# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 X a_394_52# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 VGND a_282_52# a_394_52# VNB nshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1007 KAPWR A a_27_52# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 VGND a_27_52# a_282_52# VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=180000u
+X1 a_394_52# a_282_52# VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=180000u
+X2 a_27_52# A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 KAPWR a_27_52# a_282_52# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_27_52# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_394_52# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 KAPWR a_394_52# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_394_52# a_282_52# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
 .ends
diff --git a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.cdl b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.cdl
index cd21644..eb2154a 100644
--- a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.cdl
+++ b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__dlybuf4s18kapwr_2 A KAPWR VGND VNB VPB VPWR X
 *.PININFO A:I KAPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP1 X Ab VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 net56 A VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net52 net56 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI12 Ab net52 VPB pfet_01v8_hvt m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 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 net56 A VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 net56 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
-MI10 net52 net56 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 Ab net52 VPB phighvt m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 X Ab VNB nshort 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
-MMIN0 net56 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 net52 net56 VNB nshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 Ab net52 VNB nshort m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
+MI9 net52 net56 VNB nfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 Ab net52 VNB nfet_01v8 m=1 w=1.0 l=0.18 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlybuf4s18kapwr_2
diff --git a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.netlist.tsv b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.netlist.tsv
index 0c08474..92ec5db 100644
--- a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.netlist.tsv
+++ b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__dlybuf4s18kapwr_2	A:I KAPWR: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
-MMIP1	MOSFET	X	Ab	KAPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	net56	A	KAPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net52	net56	KAPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Ab	net52	KAPWR	VPB	phighvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	X	Ab	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	net56	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net52	net56	VGND	VNB	nshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Ab	net52	VGND	VNB	nshort	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	KAPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	net56	A	KAPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net52	net56	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Ab	net52	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	X	Ab	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	net56	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net52	net56	VGND	VNB	nfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Ab	net52	VGND	VNB	nfet_01v8	1	1.0	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.spice b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.spice
index c6f840a..0fd4473 100644
--- a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.spice
+++ b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__dlybuf4s18kapwr_2 A KAPWR VGND VNB VPB VPWR X
-M1000 a_282_52# a_27_52# KAPWR VPB phighvt w=1e+06u l=180000u
-+  ad=2.65e+11p pd=2.53e+06u as=2.0066e+12p ps=1.11e+07u
-M1001 VGND a_394_52# X VNB nshort w=420000u l=150000u
-+  ad=1.4046e+12p pd=8.38e+06u as=1.176e+11p ps=1.4e+06u
-M1002 X a_394_52# KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1003 KAPWR a_282_52# a_394_52# VPB phighvt w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1004 a_282_52# a_27_52# VGND VNB nshort w=1e+06u l=180000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1005 VGND A a_27_52# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 X a_394_52# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 KAPWR a_394_52# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_282_52# a_394_52# VNB nshort w=1e+06u l=180000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1009 KAPWR A a_27_52# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 VGND a_27_52# a_282_52# VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=180000u
+X1 a_394_52# a_282_52# VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=180000u
+X2 a_27_52# A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 KAPWR a_27_52# a_282_52# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X4 a_27_52# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_394_52# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 X a_394_52# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 KAPWR a_394_52# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_394_52# a_282_52# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=180000u
+X9 X a_394_52# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.cdl b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.cdl
index e74a1b3..3c886ce 100644
--- a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.cdl
+++ b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__dlybuf4s25kapwr_1 A KAPWR VGND VNB VPB VPWR X
 *.PININFO A:I KAPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP1 X Ab VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 net56 A VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net52 net56 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
+MI12 Ab net52 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
+MI7 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 net56 A VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 net56 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
-MI10 net52 net56 VPB phighvt 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
-MI12 Ab net52 VPB phighvt 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
-MI7 X Ab VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN0 net56 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 net52 net56 VNB nshort 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
-MI11 Ab net52 VNB nshort m=1 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
+MI9 net52 net56 VNB nfet_01v8 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
+MI11 Ab net52 VNB nfet_01v8 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
 .ENDS sky130_fd_sc_lp__dlybuf4s25kapwr_1
diff --git a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.netlist.tsv b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.netlist.tsv
index 5144c46..df90e5c 100644
--- a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.netlist.tsv
+++ b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__dlybuf4s25kapwr_1	A:I KAPWR: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
-MMIP1	MOSFET	X	Ab	KAPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	net56	A	KAPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net52	net56	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Ab	net52	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	X	Ab	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	net56	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net52	net56	VGND	VNB	nshort	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Ab	net52	VGND	VNB	nshort	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	KAPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	net56	A	KAPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net52	net56	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Ab	net52	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	X	Ab	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	net56	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net52	net56	VGND	VNB	nfet_01v8	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Ab	net52	VGND	VNB	nfet_01v8	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.spice b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.spice
index f55dd40..53d9044 100644
--- a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.spice
+++ b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__dlybuf4s25kapwr_1 A KAPWR VGND VNB VPB VPWR X
-M1000 X a_394_52# KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=1.35e+12p ps=7.48e+06u
-M1001 KAPWR a_282_52# a_394_52# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1002 a_282_52# a_27_52# KAPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1003 VGND A a_27_52# VNB nshort w=420000u l=150000u
-+  ad=1.0924e+12p pd=6.44e+06u as=1.113e+11p ps=1.37e+06u
-M1004 a_282_52# a_27_52# VGND VNB nshort w=1e+06u l=250000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1005 X a_394_52# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 VGND a_282_52# a_394_52# VNB nshort w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1007 KAPWR A a_27_52# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 a_394_52# a_282_52# VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=250000u
+X1 a_27_52# A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 KAPWR a_27_52# a_282_52# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_27_52# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_27_52# a_282_52# VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=250000u
+X5 VGND a_394_52# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 KAPWR a_394_52# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_394_52# a_282_52# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.cdl b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.cdl
index 24c2508..93a7eba 100644
--- a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.cdl
+++ b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__dlybuf4s25kapwr_2 A KAPWR VGND VNB VPB VPWR X
 *.PININFO A:I KAPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP1 X Ab VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 net56 A VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net52 net56 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
+MI12 Ab net52 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
+MI7 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 net56 A VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 net56 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
-MI10 net52 net56 VPB phighvt 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
-MI12 Ab net52 VPB phighvt 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
-MI7 X Ab VNB nshort 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
-MMIN0 net56 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 net52 net56 VNB nshort 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
-MI11 Ab net52 VNB nshort m=1 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
+MI9 net52 net56 VNB nfet_01v8 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
+MI11 Ab net52 VNB nfet_01v8 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
 .ENDS sky130_fd_sc_lp__dlybuf4s25kapwr_2
diff --git a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.netlist.tsv b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.netlist.tsv
index d1785f2..bfbb685 100644
--- a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.netlist.tsv
+++ b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__dlybuf4s25kapwr_2	A:I KAPWR: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
-MMIP1	MOSFET	X	Ab	KAPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	net56	A	KAPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net52	net56	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Ab	net52	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	X	Ab	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	net56	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net52	net56	VGND	VNB	nshort	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Ab	net52	VGND	VNB	nshort	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	KAPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	net56	A	KAPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net52	net56	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Ab	net52	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	X	Ab	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	net56	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net52	net56	VGND	VNB	nfet_01v8	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Ab	net52	VGND	VNB	nfet_01v8	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.spice b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.spice
index 900203c..1cff5d9 100644
--- a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.spice
+++ b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__dlybuf4s25kapwr_2 A KAPWR VGND VNB VPB VPWR X
-M1000 VGND a_394_52# X VNB nshort w=420000u l=150000u
-+  ad=1.2646e+12p pd=8.1e+06u as=1.176e+11p ps=1.4e+06u
-M1001 X a_394_52# KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=1.8666e+12p ps=1.082e+07u
-M1002 KAPWR a_282_52# a_394_52# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1003 a_282_52# a_27_52# KAPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1004 VGND A a_27_52# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 a_282_52# a_27_52# VGND VNB nshort w=1e+06u l=250000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1006 X a_394_52# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 KAPWR a_394_52# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_282_52# a_394_52# VNB nshort w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1009 KAPWR A a_27_52# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 a_394_52# a_282_52# VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=250000u
+X1 a_27_52# A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 KAPWR a_27_52# a_282_52# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_27_52# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_27_52# a_282_52# VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=250000u
+X5 VGND a_394_52# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 X a_394_52# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 KAPWR a_394_52# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_394_52# a_282_52# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 X a_394_52# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.cdl b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.cdl
index 6939d7a..16925e4 100644
--- a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.cdl
+++ b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__dlybuf4s50kapwr_1 A KAPWR VGND VNB VPB VPWR X
 *.PININFO A:I KAPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP1 X Ab VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 net56 A VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net52 net56 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
+MI12 Ab net52 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
+MI7 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 net56 A VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 net56 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
-MI10 net52 net56 VPB phighvt m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
+MI9 net52 net56 VNB nfet_01v8 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
-MI12 Ab net52 VPB phighvt 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
-MI7 X Ab VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN0 net56 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 net52 net56 VNB nshort 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
-MI11 Ab net52 VNB nshort m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
+MI11 Ab net52 VNB nfet_01v8 m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlybuf4s50kapwr_1
diff --git a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.netlist.tsv b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.netlist.tsv
index a15611f..050149c 100644
--- a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.netlist.tsv
+++ b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__dlybuf4s50kapwr_1	A:I KAPWR: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
-MMIP1	MOSFET	X	Ab	KAPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	net56	A	KAPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net52	net56	KAPWR	VPB	phighvt	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Ab	net52	KAPWR	VPB	phighvt	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	X	Ab	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	net56	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net52	net56	VGND	VNB	nshort	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Ab	net52	VGND	VNB	nshort	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	KAPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	net56	A	KAPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net52	net56	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Ab	net52	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	X	Ab	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	net56	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net52	net56	VGND	VNB	nfet_01v8	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Ab	net52	VGND	VNB	nfet_01v8	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.spice b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.spice
index e2591e0..f4cae03 100644
--- a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.spice
+++ b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__dlybuf4s50kapwr_1 A KAPWR VGND VNB VPB VPWR X
-M1000 a_282_52# a_27_52# KAPWR VPB phighvt w=1e+06u l=500000u
-+  ad=2.65e+11p pd=2.53e+06u as=8.5e+11p ps=6.48e+06u
-M1001 X a_394_52# KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1002 KAPWR a_282_52# a_394_52# VPB phighvt w=1e+06u l=500000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1003 a_282_52# a_27_52# VGND VNB nshort w=1e+06u l=500000u
-+  ad=2.65e+11p pd=2.53e+06u as=5.924e+11p ps=5.44e+06u
-M1004 VGND A a_27_52# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 X a_394_52# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 VGND a_282_52# a_394_52# VNB nshort w=1e+06u l=500000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1007 KAPWR A a_27_52# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 KAPWR a_27_52# a_282_52# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=500000u
+X1 a_394_52# a_282_52# VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=500000u
+X2 a_27_52# A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_27_52# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_394_52# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 KAPWR a_394_52# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_394_52# a_282_52# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=500000u
+X7 VGND a_27_52# a_282_52# VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=500000u
 .ends
diff --git a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.cdl b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.cdl
index 9c1e134..ef66e80 100644
--- a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.cdl
+++ b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__dlybuf4s50kapwr_2 A KAPWR VGND VNB VPB VPWR X
 *.PININFO A:I KAPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIP1 X Ab VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 X Ab VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP0 net56 A VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net52 net56 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
+MI12 Ab net52 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
+MI7 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 net56 A VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 net56 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
-MI10 net52 net56 VPB phighvt m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
+MI9 net52 net56 VNB nfet_01v8 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
-MI12 Ab net52 VPB phighvt 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
-MI7 X Ab VNB nshort 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
-MMIN0 net56 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 net52 net56 VNB nshort 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
-MI11 Ab net52 VNB nshort m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
+MI11 Ab net52 VNB nfet_01v8 m=1 w=1.0 l=0.5 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlybuf4s50kapwr_2
diff --git a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.netlist.tsv b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.netlist.tsv
index efb2782..ec29b2d 100644
--- a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.netlist.tsv
+++ b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__dlybuf4s50kapwr_2	A:I KAPWR: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
-MMIP1	MOSFET	X	Ab	KAPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	net56	A	KAPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net52	net56	KAPWR	VPB	phighvt	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Ab	net52	KAPWR	VPB	phighvt	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	X	Ab	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	net56	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net52	net56	VGND	VNB	nshort	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Ab	net52	VGND	VNB	nshort	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	X	Ab	KAPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	net56	A	KAPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net52	net56	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Ab	net52	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	X	Ab	VGND	VNB	nfet_01v8	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	net56	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net52	net56	VGND	VNB	nfet_01v8	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Ab	net52	VGND	VNB	nfet_01v8	1	1.0	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.spice b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.spice
index 6e081a8..198fccd 100644
--- a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.spice
+++ b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__dlybuf4s50kapwr_2 A KAPWR VGND VNB VPB VPWR X
-M1000 a_282_52# a_27_52# KAPWR VPB phighvt w=1e+06u l=500000u
-+  ad=2.65e+11p pd=2.53e+06u as=1.3666e+12p ps=9.82e+06u
-M1001 VGND a_394_52# X VNB nshort w=420000u l=150000u
-+  ad=7.646e+11p pd=7.1e+06u as=1.176e+11p ps=1.4e+06u
-M1002 X a_394_52# KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1003 KAPWR a_282_52# a_394_52# VPB phighvt w=1e+06u l=500000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1004 a_282_52# a_27_52# VGND VNB nshort w=1e+06u l=500000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1005 VGND A a_27_52# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 X a_394_52# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 KAPWR a_394_52# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_282_52# a_394_52# VNB nshort w=1e+06u l=500000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1009 KAPWR A a_27_52# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 KAPWR a_27_52# a_282_52# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=500000u
+X1 a_394_52# a_282_52# VGND VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=500000u
+X2 a_27_52# A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_27_52# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_394_52# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_394_52# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 KAPWR a_394_52# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_394_52# a_282_52# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=500000u
+X8 X a_394_52# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VGND a_27_52# a_282_52# VNB sky130_fd_pr__nfet_01v8 w=1e+06u l=500000u
 .ends
diff --git a/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.cdl b/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.cdl
index eeba573..e1513de 100644
--- a/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.cdl
+++ b/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__dlygate4s15_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.84 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.84 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=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.26 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net30 A VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab net34 VPB pfet_01v8_hvt m=1 w=0.42 l=0.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.26 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=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net30 A VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__dlygate4s15_1
diff --git a/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.netlist.tsv b/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.netlist.tsv
index 5ffca46..5276ca5 100644
--- a/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.netlist.tsv
+++ b/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__dlygate4s15_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.84	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	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net34	net30	VPWR	VPB	phighvt	1	0.42	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.84	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	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net34	net30	VPWR	VPB	pfet_01v8_hvt	1	0.42	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/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.spice b/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.spice
index 29d23b1..d332025 100644
--- a/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.spice
+++ b/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__dlygate4s15_1 A VGND VNB VPB VPWR X
-M1000 a_288_52# a_27_52# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.232e+11p ps=6.22e+06u
-M1001 X a_405_136# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=7.119e+11p ps=5.38e+06u
-M1002 a_288_52# a_27_52# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1003 X a_405_136# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1004 VPWR A a_27_52# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 VGND A a_27_52# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 VGND a_288_52# a_405_136# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 VPWR a_288_52# a_405_136# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 a_405_136# a_288_52# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VGND a_405_136# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR a_405_136# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND a_27_52# a_288_52# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_405_136# a_288_52# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_27_52# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_27_52# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VPWR a_27_52# a_288_52# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.cdl b/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.cdl
index cd708b0..7e5db81 100644
--- a/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.cdl
+++ b/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__dlygate4s18_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.84 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.84 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=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB phighvt m=1 w=1.26 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=0.42 l=0.18 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net30 A VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Ab net34 VPB pfet_01v8_hvt m=1 w=0.42 l=0.18 mult=1 sa=0.265
++ 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.26 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=0.42 l=0.18 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net30 A VPB pfet_01v8_hvt m=1 w=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_lp__dlygate4s18_1
diff --git a/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.netlist.tsv b/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.netlist.tsv
index deb25a7..be64a38 100644
--- a/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.netlist.tsv
+++ b/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__dlygate4s18_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.84	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	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net34	net30	VPWR	VPB	phighvt	1	0.42	0.18	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.84	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	0.42	0.18	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net34	net30	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.18	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/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.spice b/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.spice
index f6ff875..074dcac 100644
--- a/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.spice
+++ b/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__dlygate4s18_1 A VGND VNB VPB VPWR X
-M1000 a_288_52# a_27_52# VGND VNB nshort w=420000u l=180000u
-+  ad=1.113e+11p pd=1.37e+06u as=6.867e+11p ps=5.26e+06u
-M1001 X a_405_136# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1002 X a_405_136# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=7.98e+11p ps=6.1e+06u
-M1003 VPWR A a_27_52# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 a_288_52# a_27_52# VPWR VPB phighvt w=420000u l=180000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1005 VGND A a_27_52# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 VGND a_288_52# a_405_136# VNB nshort w=420000u l=180000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 VPWR a_288_52# a_405_136# VPB phighvt w=420000u l=180000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 VGND a_27_52# a_288_52# VNB sky130_fd_pr__nfet_01v8 w=420000u l=180000u
+X1 a_405_136# a_288_52# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
+X2 VGND a_405_136# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VPWR a_405_136# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_405_136# a_288_52# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=180000u
+X5 a_27_52# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_27_52# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VPWR a_27_52# a_288_52# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=180000u
 .ends
diff --git a/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.cdl b/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.cdl
index 5720222..e83bc80 100644
--- a/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.cdl
+++ b/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__dlygate4s50_1 A VGND VNB VPB VPWR X
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMIN1 Ab net24 VNB nshort m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab net24 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X Ab VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net24 net20 VNB nshort m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
+MI6 net24 net20 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 net20 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 net20 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 net24 VPB phighvt m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X Ab VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net24 net20 VPB phighvt m=1 w=0.42 l=0.5 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net20 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 net24 VPB pfet_01v8_hvt m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X Ab VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net24 net20 VPB pfet_01v8_hvt m=1 w=0.42 l=0.5 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net20 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_lp__dlygate4s50_1
diff --git a/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.netlist.tsv b/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.netlist.tsv
index aaeb391..d883b12 100644
--- a/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.netlist.tsv
+++ b/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__dlygate4s50_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	net24	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net24	net20	VGND	VNB	nshort	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net20	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	net24	VPWR	VPB	phighvt	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	Ab	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net24	net20	VPWR	VPB	phighvt	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net20	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	net24	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net24	net20	VGND	VNB	nfet_01v8	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net20	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	net24	VPWR	VPB	pfet_01v8_hvt	1	0.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net24	net20	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.5	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net20	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/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.spice b/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.spice
index 940b1b2..3853e5b 100644
--- a/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.spice
+++ b/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__dlygate4s50_1 A VGND VNB VPB VPWR X
-M1000 X a_405_136# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=4.179e+11p ps=3.98e+06u
-M1001 X a_405_136# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=5.292e+11p ps=4.82e+06u
-M1002 VPWR A a_27_52# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1003 VGND A a_27_52# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 VGND a_288_52# a_405_136# VNB nshort w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 a_288_52# a_27_52# VGND VNB nshort w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 a_288_52# a_27_52# VPWR VPB phighvt w=420000u l=500000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1007 VPWR a_288_52# a_405_136# VPB phighvt w=420000u l=500000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 VPWR a_27_52# a_288_52# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=500000u
+X1 VGND a_27_52# a_288_52# VNB sky130_fd_pr__nfet_01v8 w=420000u l=500000u
+X2 a_405_136# a_288_52# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=500000u
+X3 VGND a_405_136# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR a_405_136# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_405_136# a_288_52# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=500000u
+X6 a_27_52# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_27_52# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.cdl b/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.cdl
index 6088124..a9c3602 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.cdl
+++ b/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI16 X net51 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-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.84 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.26 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.26 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.26 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.26 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.26 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.26 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_lp__dlymetal6s2s_1
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.netlist.tsv b/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.netlist.tsv
index 4d8f233..d3f4b13 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.netlist.tsv
+++ b/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net55	net47	VGND	VNB	nshort	1	0.84	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.84	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net55	net47	VPWR	VPB	phighvt	1	1.26	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.26	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net55	net47	VGND	VNB	nfet_01v8	1	0.84	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.84	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.26	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.26	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.26	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_lp__dlymetal6s2s_1.spice b/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.spice
index 15a4229..29d1dd0 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.spice
+++ b/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__dlymetal6s2s_1 A VGND VNB VPB VPWR X
-M1000 a_496_47# a_315_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=1.0962e+12p ps=9.6e+06u
-M1001 X a_27_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1002 a_496_47# a_315_131# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=7.623e+11p ps=7.08e+06u
-M1003 VPWR a_496_47# a_603_131# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 VGND a_496_47# a_603_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 VPWR X a_315_131# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 X a_27_131# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1007 a_784_47# a_603_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1008 VGND A a_27_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1009 a_784_47# a_603_131# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1010 VPWR A a_27_131# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1011 VGND X a_315_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 VGND a_27_131# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VPWR a_27_131# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_27_131# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_315_131# X VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_603_131# a_496_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_27_131# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_603_131# a_784_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VPWR a_603_131# a_784_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_315_131# X VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VGND a_315_131# a_496_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_603_131# a_496_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR a_315_131# a_496_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.cdl b/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.cdl
index 64ae6a4..df95ee6 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.cdl
+++ b/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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 net042 Ab VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 X net20 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 net038 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 net20 net060 VNB nshort m=1 w=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 net060 net038 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MMIN2 net042 Ab VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab X VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 X net20 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 net042 Ab VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MI15 net038 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
-MI7 X net20 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net20 net060 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI9 net20 net060 VNB nfet_01v8 m=1 w=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 net060 net038 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MI16 net060 net038 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 net038 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 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 net042 Ab VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 X net20 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net20 net060 VPB pfet_01v8_hvt m=1 w=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 net060 net038 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI17 net038 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_lp__dlymetal6s4s_1
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.netlist.tsv b/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.netlist.tsv
index 6a47288..aac1199 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.netlist.tsv
+++ b/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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	net042	Ab	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	X	net20	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	net038	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net20	net060	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net060	net038	VGND	VNB	nshort	1	0.84	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	net042	Ab	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	X	net20	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net20	net060	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net060	net038	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	net038	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	net042	Ab	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	X	net20	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	net038	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net20	net060	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net060	net038	VGND	VNB	nfet_01v8	1	0.84	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	net042	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	X	net20	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net20	net060	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net060	net038	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	net038	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_lp__dlymetal6s4s_1.spice b/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.spice
index 4a151f9..4c44b49 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.spice
+++ b/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__dlymetal6s4s_1 A VGND VNB VPB VPWR X
-M1000 X a_315_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=1.0962e+12p ps=9.6e+06u
-M1001 a_208_47# a_27_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1002 X a_315_131# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=7.623e+11p ps=7.08e+06u
-M1003 VPWR X a_603_131# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 VGND X a_603_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 VPWR a_208_47# a_315_131# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 a_208_47# a_27_131# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1007 a_784_47# a_603_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1008 VGND A a_27_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1009 a_784_47# a_603_131# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1010 VPWR A a_27_131# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1011 VGND a_208_47# a_315_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 VGND a_27_131# a_208_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VPWR a_27_131# a_208_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_27_131# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_315_131# a_208_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_603_131# X VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_27_131# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_603_131# a_784_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VPWR a_603_131# a_784_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_315_131# a_208_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VGND a_315_131# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_603_131# X VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR a_315_131# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.cdl b/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.cdl
index 8b369e0..c35a6bd 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.cdl
+++ b/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__dlymetal6s6s_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
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X Ab VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net55 net47 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-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.84 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 X Ab VPB phighvt m=1 w=1.26 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.26 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.26 l=0.15 mult=1 sa=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
-MI17 net51 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.84 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.84 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.84 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 X Ab VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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_lp__dlymetal6s6s_1
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.netlist.tsv b/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.netlist.tsv
index 89dbecf..8895536 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.netlist.tsv
+++ b/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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	net55	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net55	net47	VGND	VNB	nshort	1	0.84	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.84	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	X	Ab	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net55	net47	VPWR	VPB	phighvt	1	1.26	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.26	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	X	Ab	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net55	net47	VGND	VNB	nfet_01v8	1	0.84	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.84	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	X	Ab	VPWR	VPB	pfet_01v8_hvt	1	1.26	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.26	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.26	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/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.spice b/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.spice
index 326518a..c2ec93b 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.spice
+++ b/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__dlymetal6s6s_1 A VGND VNB VPB VPWR X
-M1000 a_496_47# a_315_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=1.0962e+12p ps=9.6e+06u
-M1001 a_208_47# a_27_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1002 a_496_47# a_315_131# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=7.623e+11p ps=7.08e+06u
-M1003 VPWR a_496_47# a_603_131# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 VGND a_496_47# a_603_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 VPWR a_208_47# a_315_131# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 a_208_47# a_27_131# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1007 X a_603_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1008 VGND A a_27_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1009 X a_603_131# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1010 VPWR A a_27_131# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1011 VGND a_208_47# a_315_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 VGND a_27_131# a_208_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VPWR a_27_131# a_208_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_27_131# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_315_131# a_208_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_603_131# a_496_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_27_131# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_603_131# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VPWR a_603_131# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_315_131# a_208_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VGND a_315_131# a_496_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_603_131# a_496_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR a_315_131# a_496_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_1.cdl b/cells/ebufn/sky130_fd_sc_lp__ebufn_1.cdl
index 769fb1c..3706fb2 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_1.cdl
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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 net025 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z net025 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA net32 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net32 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
-MI6 net025 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
-MMP0 VPWR TE_B VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB net025 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MMN1 sndA net32 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 net32 TE_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMIN1 net32 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
-MI5 net025 A VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net025 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TE_B VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB net025 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net32 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
+MI5 net025 A 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_lp__ebufn_1
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_1.netlist.tsv b/cells/ebufn/sky130_fd_sc_lp__ebufn_1.netlist.tsv
index 54fb663..b723015 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_1.netlist.tsv
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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	net025	sndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net32	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net32	TE_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net025	A	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	net025	Z	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net32	TE_B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net025	A	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	net025	sndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net32	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net32	TE_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net025	A	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	net025	Z	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net32	TE_B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net025	A	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/ebufn/sky130_fd_sc_lp__ebufn_1.spice b/cells/ebufn/sky130_fd_sc_lp__ebufn_1.spice
index 4eac6d0..9748cbe 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_1.spice
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__ebufn_1 A TE_B VGND VNB VPB VPWR Z
-M1000 VPWR TE_B a_165_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=8.135e+11p pd=5.79e+06u as=3.024e+11p ps=3e+06u
-M1001 VPWR TE_B a_219_21# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1002 VGND TE_B a_219_21# VNB nshort w=420000u l=150000u
-+  ad=4.158e+11p pd=3.93e+06u as=1.197e+11p ps=1.41e+06u
-M1003 a_171_73# a_105_263# Z VNB nshort w=840000u l=150000u
-+  ad=2.016e+11p pd=2.16e+06u as=2.394e+11p ps=2.25e+06u
-M1004 a_105_263# A VPWR VPB phighvt w=640000u l=150000u
-+  ad=2.144e+11p pd=1.95e+06u as=0p ps=0u
-M1005 a_105_263# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1006 VGND a_219_21# a_171_73# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_165_367# a_105_263# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.591e+11p ps=3.09e+06u
+X0 a_219_21# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_165_367# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_219_21# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 VPWR A a_105_263# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 Z a_105_263# a_165_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_171_73# a_219_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VGND A a_105_263# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 Z a_105_263# a_171_73# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_2.cdl b/cells/ebufn/sky130_fd_sc_lp__ebufn_2.cdl
index 8571b61..163d962 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_2.cdl
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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 net39 VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z net39 VNB nfet_01v8 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
-MMN1 sndA net43 VNB nshort 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
-MMIN1 net43 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
-MI6 net39 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
-MMP0 VPWR TE_B VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB net39 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
+MMN1 sndA net43 VNB nfet_01v8 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 net43 TE_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMIN1 net43 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
-MI5 net39 A VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net39 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TE_B VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB net39 VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net43 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
+MI5 net39 A 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_lp__ebufn_2
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_2.netlist.tsv b/cells/ebufn/sky130_fd_sc_lp__ebufn_2.netlist.tsv
index 1ba986b..5d08707 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_2.netlist.tsv
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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	net39	sndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net43	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net43	TE_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net39	A	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	net39	Z	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net43	TE_B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net39	A	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	net39	sndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net43	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net43	TE_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net39	A	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	net39	Z	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net43	TE_B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net39	A	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/ebufn/sky130_fd_sc_lp__ebufn_2.spice b/cells/ebufn/sky130_fd_sc_lp__ebufn_2.spice
index c175c39..3289791 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_2.spice
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__ebufn_2 A TE_B VGND VNB VPB VPWR Z
-M1000 a_39_367# TE_B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.071e+12p pd=9.26e+06u as=7.272e+11p ps=6.13e+06u
-M1001 Z a_96_21# a_27_47# VNB nshort w=840000u l=150000u
-+  ad=2.436e+11p pd=2.26e+06u as=8.232e+11p ps=7e+06u
-M1002 Z a_96_21# a_39_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1003 VPWR TE_B a_39_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_47# a_284_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.06e+06u
-M1005 a_96_21# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1006 VPWR TE_B a_284_21# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.56e+11p ps=2.08e+06u
-M1007 VGND a_284_21# a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND TE_B a_284_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1009 a_27_47# a_96_21# Z VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_39_367# a_96_21# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_96_21# A VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
+X0 Z a_96_21# a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_284_21# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 VPWR A a_96_21# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_27_47# a_96_21# Z VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND a_284_21# a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_39_367# a_96_21# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_39_367# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 Z a_96_21# a_39_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_284_21# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND A a_96_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_27_47# a_284_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VPWR TE_B a_39_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_4.cdl b/cells/ebufn/sky130_fd_sc_lp__ebufn_4.cdl
index 4c95b9e..54c8f80 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_4.cdl
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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 net39 VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z net39 VNB nfet_01v8 m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA net43 VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net43 TE_B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net39 A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP0 VPWR TE_B VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB net39 VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265
+MMN1 sndA net43 VNB nfet_01v8 m=4 w=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 net43 TE_B VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MMIN1 net43 TE_B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net39 A VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net39 A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 VPWR TE_B VPB pfet_01v8_hvt m=4 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB net39 VPB pfet_01v8_hvt m=4 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net43 TE_B VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net39 A VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__ebufn_4
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_4.netlist.tsv b/cells/ebufn/sky130_fd_sc_lp__ebufn_4.netlist.tsv
index 314489e..1a5ce2f 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_4.netlist.tsv
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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	net39	sndA	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net43	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net43	TE_B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net39	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	net39	Z	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net43	TE_B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net39	A	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	net39	sndA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net43	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net43	TE_B	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net39	A	VGND	VNB	nfet_01v8	1	0.84	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	net39	Z	VPB	pfet_01v8_hvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net43	TE_B	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net39	A	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_4.spice b/cells/ebufn/sky130_fd_sc_lp__ebufn_4.spice
index cb7ed9f..76841b6 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_4.spice
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_4.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__ebufn_4 A TE_B VGND VNB VPB VPWR Z
-M1000 Z a_84_21# a_27_47# VNB nshort w=840000u l=150000u
-+  ad=5.292e+11p pd=4.62e+06u as=1.2432e+12p ps=1.136e+07u
-M1001 Z a_84_21# a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.938e+11p pd=6.3e+06u as=1.953e+12p ps=1.57e+07u
-M1002 VPWR TE_B a_456_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.5498e+12p pd=1.002e+07u as=5.185e+11p ps=3.42e+06u
-M1003 a_27_47# a_84_21# Z VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Z a_84_21# a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_84_21# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1006 a_27_367# a_84_21# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_367# TE_B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_456_21# a_27_47# VNB nshort w=840000u l=150000u
-+  ad=8.232e+11p pd=7e+06u as=0p ps=0u
-M1009 VPWR TE_B a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_456_21# a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Z a_84_21# a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND TE_B a_456_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.25e+06u
-M1013 a_27_47# a_456_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_47# a_456_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_27_367# a_84_21# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR TE_B a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_367# TE_B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_47# a_84_21# Z VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_84_21# A VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
+X0 a_27_47# a_456_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_27_47# a_84_21# Z VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_27_47# a_84_21# Z VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VGND a_456_21# a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 Z a_84_21# a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_456_21# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_27_47# a_456_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_27_367# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR A a_84_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VGND a_456_21# a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 Z a_84_21# a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_27_367# a_84_21# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VPWR TE_B a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 Z a_84_21# a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VPWR TE_B a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 Z a_84_21# a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_27_367# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_456_21# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_27_367# a_84_21# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VGND A a_84_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_8.cdl b/cells/ebufn/sky130_fd_sc_lp__ebufn_8.cdl
index f83f95c..041a4f8 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_8.cdl
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_8.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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 net39 VNB nshort m=8 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z net39 VNB nfet_01v8 m=8 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA net43 VNB nshort m=8 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net43 TE_B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net39 A VNB nshort 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
-MMP0 VPWR TE_B VPB phighvt m=8 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB net39 VPB phighvt m=8 w=1.26 l=0.15 mult=1 sa=0.265
+MMN1 sndA net43 VNB nfet_01v8 m=8 w=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 net43 TE_B VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MMIN1 net43 TE_B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net39 A VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net39 A VNB nfet_01v8 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
+MMP0 VPWR TE_B VPB pfet_01v8_hvt m=8 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB net39 VPB pfet_01v8_hvt m=8 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net43 TE_B VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net39 A VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__ebufn_8
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_8.netlist.tsv b/cells/ebufn/sky130_fd_sc_lp__ebufn_8.netlist.tsv
index 1335546..d7a6538 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_8.netlist.tsv
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_8.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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	net39	sndA	VNB	nshort	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net43	VGND	VNB	nshort	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net43	TE_B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net39	A	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	phighvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	net39	Z	VPB	phighvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net43	TE_B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net39	A	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	net39	sndA	VNB	nfet_01v8	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net43	VGND	VNB	nfet_01v8	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net43	TE_B	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net39	A	VGND	VNB	nfet_01v8	2	0.84	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	net39	Z	VPB	pfet_01v8_hvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net43	TE_B	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net39	A	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_8.spice b/cells/ebufn/sky130_fd_sc_lp__ebufn_8.spice
index 5c05ed4..73d9897 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_8.spice
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_8.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_lp__ebufn_8 A TE_B VGND VNB VPB VPWR Z
-M1000 VPWR TE_B a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.1231e+12p pd=1.849e+07u as=3.1878e+12p ps=2.774e+07u
-M1001 VGND a_772_21# a_27_47# VNB nshort w=840000u l=150000u
-+  ad=1.4154e+12p pd=1.345e+07u as=2.1252e+12p ps=2.018e+07u
-M1002 a_27_367# TE_B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_27_47# a_84_21# Z VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=9.408e+11p ps=8.96e+06u
-M1004 a_27_47# a_772_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_47# a_84_21# Z VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Z a_84_21# a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=0p ps=0u
-M1007 a_27_47# a_772_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A a_84_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1009 a_27_47# a_84_21# Z VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Z a_84_21# a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_367# a_84_21# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR TE_B a_772_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.591e+11p ps=3.09e+06u
-M1013 VPWR TE_B a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR TE_B a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_772_21# a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_27_367# a_84_21# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Z a_84_21# a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR TE_B a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_84_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1020 VGND TE_B a_772_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.25e+06u
-M1021 a_27_367# a_84_21# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Z a_84_21# a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_47# a_772_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Z a_84_21# a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_27_47# a_84_21# Z VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_27_47# a_772_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_27_367# TE_B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Z a_84_21# a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND a_772_21# a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_27_367# TE_B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Z a_84_21# a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_84_21# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_84_21# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_27_367# TE_B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_27_367# a_84_21# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Z a_84_21# a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND a_772_21# a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_47# a_84_21# Z VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 Z a_84_21# a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_27_367# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_27_47# a_84_21# Z VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_27_47# a_772_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_27_47# a_84_21# Z VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VGND a_772_21# a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VPWR TE_B a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND a_772_21# a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 Z a_84_21# a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_27_367# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_27_47# a_772_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VPWR TE_B a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_27_367# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_772_21# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VPWR TE_B a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_27_367# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 Z a_84_21# a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_27_367# a_84_21# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_27_367# a_84_21# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 VPWR TE_B a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 VPWR A a_84_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 a_772_21# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 Z a_84_21# a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 a_27_367# a_84_21# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 a_27_47# a_84_21# Z VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 VGND A a_84_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 Z a_84_21# a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X28 a_84_21# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 VGND a_772_21# a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X30 Z a_84_21# a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X31 a_27_47# a_772_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X32 a_27_47# a_772_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X33 a_84_21# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X34 VGND a_772_21# a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X35 a_27_367# a_84_21# Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X36 Z a_84_21# a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X37 Z a_84_21# a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.cdl b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.cdl
index 7429b18..d6024f9 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.cdl
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__ebufn_lp 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 net025 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z net025 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA net32 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net32 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
-MI10 net035 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
-MI6 net025 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
-MI8 net039 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
-MMP0 VPWR TE_B VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB net025 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MMN1 sndA net32 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 net32 TE_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMIN1 net32 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
-MI9 net059 TE_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI10 net035 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
+MI6 net025 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
-MI7 net066 A VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net039 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
-MI5 net025 A 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=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndTEB net025 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net32 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
+MI9 net059 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
+MI7 net066 A 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
+MI5 net025 A 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_lp__ebufn_lp
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.netlist.tsv b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.netlist.tsv
index 7159ff9..c7ee470 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.netlist.tsv
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__ebufn_lp	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	net025	sndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net32	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net32	TE_B	net035	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net035	TE_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net025	A	net039	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net039	A	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	net025	Z	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net32	TE_B	net059	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net059	TE_B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net066	A	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net025	A	net066	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	net025	sndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net32	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net32	TE_B	net035	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net035	TE_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net025	A	net039	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net039	A	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	net025	Z	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net32	TE_B	net059	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net059	TE_B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net066	A	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net025	A	net066	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/ebufn/sky130_fd_sc_lp__ebufn_lp.spice b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.spice
index 08447c7..4cade77 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.spice
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__ebufn_lp A TE_B VGND VNB VPB VPWR Z
-M1000 VGND A a_122_131# VNB nshort w=420000u l=150000u
-+  ad=4.242e+11p pd=3.93e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VPWR A a_116_483# VPB phighvt w=640000u l=150000u
-+  ad=8.679e+11p pd=5.96e+06u as=1.536e+11p ps=1.76e+06u
-M1002 a_515_367# a_29_483# Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.024e+11p pd=3e+06u as=3.591e+11p ps=3.09e+06u
-M1003 a_242_237# TE_B a_708_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1004 a_122_131# A a_29_483# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1005 a_708_47# TE_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_242_237# TE_B a_702_401# VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=1.536e+11p ps=1.76e+06u
-M1007 VPWR TE_B a_515_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Z a_29_483# a_308_47# VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=2.016e+11p ps=2.16e+06u
-M1009 a_308_47# a_242_237# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_116_483# A a_29_483# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1011 a_702_401# TE_B VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR TE_B a_702_401# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_308_47# a_29_483# Z VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 Z a_29_483# a_515_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND TE_B a_708_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_116_483# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 VGND a_242_237# a_308_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_702_401# TE_B a_242_237# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 a_708_47# TE_B a_242_237# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_122_131# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_29_483# A a_122_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_29_483# A a_116_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 a_515_367# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.cdl b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.cdl
index 0273da0..94525b9 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.cdl
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__ebufn_lp2 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 net39 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z net39 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 sndA net47 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA net47 VNB nfet_01v8 m=1 w=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 net47 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
+MI10 net43 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
+MI6 net39 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 net47 TE_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net35 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net43 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
-MI6 net39 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
-MI8 net35 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
-MMP0 VPWR TE_B 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
-MMP1 sndTEB net39 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
-MMIP1 net47 TE_B 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
-MI7 net39 A VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR TE_B 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
+MMP1 sndTEB net39 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
+MMIP1 net47 TE_B 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
+MI7 net39 A 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_lp__ebufn_lp2
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.netlist.tsv b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.netlist.tsv
index ac29baf..40b3777 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.netlist.tsv
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__ebufn_lp2	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	net39	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net47	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net47	TE_B	net43	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net43	TE_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net39	A	net35	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net35	A	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	net39	Z	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net47	TE_B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net39	A	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	net39	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net47	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net47	TE_B	net43	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net43	TE_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net39	A	net35	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net35	A	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	net39	Z	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net47	TE_B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net39	A	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/ebufn/sky130_fd_sc_lp__ebufn_lp2.spice b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.spice
index 43d2243..cb91c76 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.spice
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__ebufn_lp2 A TE_B VGND VNB VPB VPWR Z
-M1000 VPWR A a_27_47# VPB phighvt w=1e+06u l=250000u
-+  ad=5.65e+11p pd=5.13e+06u as=2.85e+11p ps=2.57e+06u
-M1001 a_114_47# A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1002 a_232_231# TE_B a_606_153# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.008e+11p ps=1.32e+06u
-M1003 a_425_193# a_27_47# Z VNB nshort w=420000u l=150000u
-+  ad=1.715e+11p pd=1.89e+06u as=1.197e+11p ps=1.41e+06u
-M1004 a_475_419# a_27_47# Z VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=2.85e+11p ps=2.57e+06u
-M1005 a_232_231# TE_B VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1006 a_606_153# TE_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.877e+11p ps=3.05e+06u
-M1007 VGND A a_114_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_232_231# a_425_193# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR TE_B a_475_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_114_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_27_47# A a_114_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 Z a_27_47# a_475_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_27_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_475_419# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 VGND TE_B a_606_153# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 Z a_27_47# a_425_193# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_606_153# TE_B a_232_231# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_425_193# a_232_231# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR TE_B a_232_231# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.cdl b/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.cdl
index 9ca7db4..f5a38c1 100644
--- a/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.cdl
+++ b/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.cdl
@@ -16,76 +16,76 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 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=0.64 l=0.15 mult=1 sa=0.265
+MI14 net123 M1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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=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 S0 clkneg VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net83 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=0.64 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.26 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=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI645 Q S0 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI658 net83 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=0.64 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.26 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=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
-MI661 Q_N S1 VNB nshort m=1 w=0.84 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
-MI641 net183 S1 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
-MI642 S0 clkneg 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI635 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net180 DE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI641 net183 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 net180 DE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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.84 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 net168 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI16 net156 M1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 S0 clkpos VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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 net168 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 net156 M1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 S0 clkpos VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-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_lp__edfxbp_1
diff --git a/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.netlist.tsv b/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.netlist.tsv
index 91c7b46..4efeb9d 100644
--- a/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.netlist.tsv
+++ b/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.netlist.tsv
@@ -1,38 +1,38 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	S0	clkneg	net123	VPB	phighvt	1	1.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net83	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	0.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net83	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	0.64	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	S1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net183	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	net183	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net180	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net168	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	net168	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	net156	M1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	S0	clkpos	net156	VNB	nshort	1	0.84	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	net180	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	0.64	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net83	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	0.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net83	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	0.64	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.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.42	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net183	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	net183	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net180	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net168	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	net168	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	net156	M1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	S0	clkpos	net156	VNB	nfet_01v8	1	0.84	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	net180	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_lp__edfxbp_1.spice b/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.spice
index f73d337..1cf68f6 100644
--- a/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.spice
+++ b/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_lp__edfxbp_1 CLK D DE VGND VNB VPB VPWR Q Q_N
-M1000 Q_N a_587_350# VGND VNB nshort w=840000u l=150000u
-+  ad=2.31e+11p pd=2.23e+06u as=1.9718e+12p ps=1.591e+07u
-M1001 a_120_179# DE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=2.277e+12p ps=1.83e+07u
-M1002 a_404_53# a_120_179# VGND VNB nshort w=420000u l=150000u
-+  ad=2.73e+11p pd=2.98e+06u as=0p ps=0u
-M1003 a_286_423# a_587_350# a_531_423# VPB phighvt w=420000u l=150000u
-+  ad=2.394e+11p pd=2.82e+06u as=2.31e+11p ps=2.78e+06u
-M1004 a_1971_388# a_958_290# a_1865_367# VPB phighvt w=420000u l=150000u
-+  ad=2.94e+11p pd=3.08e+06u as=3.864e+11p ps=3.28e+06u
-M1005 VPWR DE a_286_423# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_1986_57# a_958_290# a_1865_367# VNB nshort w=840000u l=150000u
-+  ad=2.184e+11p pd=2.2e+06u as=2.898e+11p ps=2.48e+06u
-M1007 a_120_179# DE VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1008 a_902_396# a_872_324# a_761_396# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=3.465e+11p ps=3.33e+06u
-M1009 VPWR a_1067_65# a_1781_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=6.804e+11p ps=6.12e+06u
-M1010 Q_N a_587_350# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1011 a_1004_91# a_958_290# a_902_396# VNB nshort w=420000u l=150000u
-+  ad=1.323e+11p pd=1.47e+06u as=1.344e+11p ps=1.48e+06u
-M1012 Q a_1865_367# VGND VNB nshort w=840000u l=150000u
-+  ad=2.31e+11p pd=2.23e+06u as=0p ps=0u
-M1013 a_902_396# a_872_324# a_531_423# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.541e+11p ps=2.89e+06u
-M1014 VGND a_1067_65# a_1004_91# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1067_65# a_902_396# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1016 a_1789_141# a_587_350# VGND VNB nshort w=420000u l=150000u
-+  ad=2.814e+11p pd=3.02e+06u as=0p ps=0u
-M1017 a_404_53# a_587_350# a_531_423# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND CLK a_872_324# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.68e+11p ps=1.64e+06u
-M1019 a_1971_388# a_587_350# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1865_367# a_872_324# a_1789_141# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_958_290# a_872_324# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1022 VGND DE a_231_53# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.82e+06u
-M1023 VPWR CLK a_872_324# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1024 VGND a_1865_367# a_587_350# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1025 a_531_423# D a_459_423# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1026 a_459_423# a_120_179# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_1067_65# a_761_396# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND a_1067_65# a_1986_57# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_531_423# D a_231_53# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1865_367# a_872_324# a_1781_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Q a_1865_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.402e+11p pd=3.06e+06u as=0p ps=0u
-M1032 a_958_290# a_872_324# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1033 a_531_423# a_958_290# a_902_396# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR a_1865_367# a_587_350# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1035 a_1067_65# a_902_396# VGND VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
+X0 a_531_423# a_587_350# a_286_423# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_1789_141# a_872_324# a_1865_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND DE a_120_179# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR a_902_396# a_1067_65# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 VPWR a_120_179# a_459_423# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_286_423# DE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_231_53# DE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_872_324# a_958_290# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND a_120_179# a_404_53# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_1865_367# a_958_290# a_1971_388# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_1986_57# a_1067_65# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_1781_367# a_872_324# a_1865_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_902_396# a_958_290# a_1004_91# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_1865_367# a_958_290# a_1986_57# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 VGND a_587_350# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_531_423# a_587_350# a_404_53# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_459_423# D a_531_423# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 VGND a_587_350# a_1789_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_902_396# a_958_290# a_531_423# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 a_761_396# a_872_324# a_902_396# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 VPWR a_587_350# a_1971_388# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 VPWR a_587_350# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 a_761_396# a_1067_65# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X23 a_872_324# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X24 a_587_350# a_1865_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X25 a_231_53# D a_531_423# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_531_423# a_872_324# a_902_396# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 VGND a_902_396# a_1067_65# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X28 VGND a_1865_367# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 VPWR DE a_120_179# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X30 VPWR a_1865_367# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 VPWR a_872_324# a_958_290# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X32 a_1781_367# a_1067_65# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X33 a_872_324# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_587_350# a_1865_367# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 a_1004_91# a_1067_65# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_0.cdl b/cells/einvn/sky130_fd_sc_lp__einvn_0.cdl
index 5e4a097..11f022a 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_0.cdl
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_0.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__einvn_0 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.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA net32 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z 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 net32 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=0.64 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=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 net32 TE_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMN1 sndA net32 VNB nfet_01v8 m=1 w=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 net32 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=0.64 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=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 net32 TE_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
 .ENDS sky130_fd_sc_lp__einvn_0
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_0.netlist.tsv b/cells/einvn/sky130_fd_sc_lp__einvn_0.netlist.tsv
index ba1ebc8..e8fbf38 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_0.netlist.tsv
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_0.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__einvn_0	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net32	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net32	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net32	TE_B	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net32	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net32	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net32	TE_B	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/einvn/sky130_fd_sc_lp__einvn_0.spice b/cells/einvn/sky130_fd_sc_lp__einvn_0.spice
index af51a7f..dbd9e20 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_0.spice
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_0.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__einvn_0 A TE_B VGND VNB VPB VPWR Z
-M1000 Z A a_224_481# VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=1.536e+11p ps=1.76e+06u
-M1001 VPWR TE_B a_28_141# VPB phighvt w=420000u l=150000u
-+  ad=2.158e+11p pd=2.03e+06u as=1.197e+11p ps=1.41e+06u
-M1002 Z A a_224_141# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.008e+11p ps=1.32e+06u
-M1003 a_224_481# TE_B VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND TE_B a_28_141# VNB nshort w=420000u l=150000u
-+  ad=1.743e+11p pd=1.67e+06u as=1.113e+11p ps=1.37e+06u
-M1005 a_224_141# a_28_141# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR TE_B a_224_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_28_141# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_28_141# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VGND a_28_141# a_224_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_224_481# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_224_141# A Z VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_1.cdl b/cells/einvn/sky130_fd_sc_lp__einvn_1.cdl
index aacae2d..34c0f42 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_1.cdl
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA net32 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net32 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 net32 TE_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMN1 sndA net32 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 net32 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net32 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_lp__einvn_1
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_1.netlist.tsv b/cells/einvn/sky130_fd_sc_lp__einvn_1.netlist.tsv
index 47e5e60..90a5664 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_1.netlist.tsv
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net32	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net32	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net32	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net32	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net32	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net32	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_lp__einvn_1.spice b/cells/einvn/sky130_fd_sc_lp__einvn_1.spice
index 746f321..9f0546c 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_1.spice
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__einvn_1 A TE_B VGND VNB VPB VPWR Z
-M1000 a_166_73# A Z VNB nshort w=840000u l=150000u
-+  ad=2.016e+11p pd=2.16e+06u as=2.226e+11p ps=2.21e+06u
-M1001 VGND a_214_21# a_166_73# VNB nshort w=840000u l=150000u
-+  ad=3.906e+11p pd=2.95e+06u as=0p ps=0u
-M1002 a_214_21# TE_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1003 a_214_21# TE_B VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=4.9845e+11p ps=3.43e+06u
-M1004 a_166_367# A Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.024e+11p pd=3e+06u as=3.339e+11p ps=3.05e+06u
-M1005 VPWR TE_B a_166_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND TE_B a_214_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_166_73# a_214_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_166_367# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 Z A a_166_73# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR TE_B a_214_21# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 Z A a_166_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_2.cdl b/cells/einvn/sky130_fd_sc_lp__einvn_2.cdl
index b125e26..6351790 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_2.cdl
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8 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
-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.84 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.26 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.26 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.26 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.26 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_lp__einvn_2
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_2.netlist.tsv b/cells/einvn/sky130_fd_sc_lp__einvn_2.netlist.tsv
index d591a32..b68d1d0 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_2.netlist.tsv
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	2	0.84	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	2	1.26	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	2	0.84	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.26	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.26	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_lp__einvn_2.spice b/cells/einvn/sky130_fd_sc_lp__einvn_2.spice
index 4eecd80..935c3c5 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_2.spice
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__einvn_2 A TE_B VGND VNB VPB VPWR Z
-M1000 a_220_367# A Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=6.678e+11p ps=6.1e+06u
-M1001 Z A a_251_47# VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=6.804e+11p ps=6.66e+06u
-M1002 VGND TE_B a_28_62# VNB nshort w=420000u l=150000u
-+  ad=3.465e+11p pd=3.61e+06u as=1.197e+11p ps=1.41e+06u
-M1003 a_251_47# A Z VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_28_62# a_251_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_251_47# a_28_62# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR TE_B a_28_62# VPB phighvt w=640000u l=150000u
-+  ad=7.382e+11p pd=6.32e+06u as=1.696e+11p ps=1.81e+06u
-M1007 VPWR TE_B a_220_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Z A a_220_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_220_367# TE_B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_220_367# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR TE_B a_220_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VGND a_28_62# a_251_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_28_62# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 a_251_47# A Z VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 Z A a_220_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 Z A a_251_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_28_62# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_251_47# a_28_62# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_220_367# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_4.cdl b/cells/einvn/sky130_fd_sc_lp__einvn_4.cdl
index b5cec14..d057e36 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_4.cdl
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8 m=4 w=0.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA TE VNB nfet_01v8 m=4 w=0.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 TE TE_B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB phighvt m=4 w=1.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__einvn_4
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_4.netlist.tsv b/cells/einvn/sky130_fd_sc_lp__einvn_4.netlist.tsv
index 48c864e..88fe27f 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_4.netlist.tsv
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TE	TE_B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TE	TE_B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	4	0.84	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.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_4.spice b/cells/einvn/sky130_fd_sc_lp__einvn_4.spice
index 6967ce3..9a50c3e 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_4.spice
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_lp__einvn_4 A TE_B VGND VNB VPB VPWR Z
-M1000 Z A a_87_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=9.072e+11p pd=6.48e+06u as=1.7262e+12p ps=1.534e+07u
-M1001 a_87_367# A Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Z A a_83_69# VNB nshort w=840000u l=150000u
-+  ad=6.048e+11p pd=4.8e+06u as=1.2264e+12p ps=1.132e+07u
-M1003 a_83_69# A Z VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Z A a_83_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR TE_B a_87_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0395e+12p pd=9.21e+06u as=0p ps=0u
-M1006 VPWR TE_B a_87_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_83_69# a_555_201# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=6.93e+11p ps=6.69e+06u
-M1008 a_83_69# a_555_201# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_83_69# A Z VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_87_367# A Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_555_201# TE_B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1012 VGND a_555_201# a_83_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Z A a_87_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_555_201# a_83_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_87_367# TE_B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_555_201# TE_B VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1017 a_87_367# TE_B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_87_367# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR TE_B a_555_201# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR TE_B a_87_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 Z A a_87_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_87_367# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_87_367# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_83_69# A Z VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 Z A a_83_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VPWR TE_B a_87_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VGND TE_B a_555_201# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 Z A a_83_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VGND a_555_201# a_83_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_83_69# a_555_201# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_87_367# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 Z A a_87_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_83_69# A Z VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 VGND a_555_201# a_83_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_83_69# a_555_201# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_8.cdl b/cells/einvn/sky130_fd_sc_lp__einvn_8.cdl
index 1cea97d..f284cae 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_8.cdl
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_8.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8 m=8 w=0.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA TE VNB nfet_01v8 m=8 w=0.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 TE TE_B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB phighvt m=8 w=1.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__einvn_8
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_8.netlist.tsv b/cells/einvn/sky130_fd_sc_lp__einvn_8.netlist.tsv
index a8db117..b10f912 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_8.netlist.tsv
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_8.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TE	TE_B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TE_B	sndTEB	VPB	phighvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TE	TE_B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	8	0.84	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.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_8.spice b/cells/einvn/sky130_fd_sc_lp__einvn_8.spice
index 03953d9..ba1eead 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_8.spice
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_8.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_lp__einvn_8 A TE_B VGND VNB VPB VPWR Z
-M1000 a_305_47# A Z VNB nshort w=840000u l=150000u
-+  ad=2.0916e+12p pd=2.01e+07u as=9.408e+11p ps=8.96e+06u
-M1001 VPWR TE_B a_305_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7451e+12p pd=1.537e+07u as=3.1374e+12p ps=2.766e+07u
-M1002 Z A a_305_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_305_367# A Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.4112e+12p ps=1.232e+07u
-M1004 VGND a_110_57# a_305_47# VNB nshort w=840000u l=150000u
-+  ad=1.1634e+12p pd=1.117e+07u as=0p ps=0u
-M1005 Z A a_305_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR TE_B a_305_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Z A a_305_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Z A a_305_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_305_367# A Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_110_57# TE_B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1011 a_305_367# TE_B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_110_57# a_305_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Z A a_305_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_305_47# a_110_57# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_305_47# A Z VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_305_47# a_110_57# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Z A a_305_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_305_367# TE_B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_305_47# A Z VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Z A a_305_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Z A a_305_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_305_367# TE_B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_110_57# TE_B VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1024 a_305_367# TE_B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR TE_B a_305_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_305_47# a_110_57# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_110_57# a_305_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND a_110_57# a_305_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_305_367# A Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR TE_B a_305_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_305_367# A Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_305_47# A Z VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_305_47# a_110_57# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_305_367# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_305_47# A Z VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VGND a_110_57# a_305_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_305_47# a_110_57# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_305_47# A Z VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 Z A a_305_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR TE_B a_305_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VPWR TE_B a_305_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 Z A a_305_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VPWR TE_B a_110_57# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_305_367# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_305_367# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VPWR TE_B a_305_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_305_367# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_305_367# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 Z A a_305_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 Z A a_305_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_305_367# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 a_305_47# A Z VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 a_305_367# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 VPWR TE_B a_305_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 a_305_47# a_110_57# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 VGND a_110_57# a_305_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_305_47# A Z VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 a_305_47# a_110_57# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 Z A a_305_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 Z A a_305_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 a_305_367# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 VGND a_110_57# a_305_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 Z A a_305_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 a_305_47# a_110_57# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X31 VGND TE_B a_110_57# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X32 VGND a_110_57# a_305_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X33 Z A a_305_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_lp.cdl b/cells/einvn/sky130_fd_sc_lp__einvn_lp.cdl
index 3962d24..83731d0 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_lp.cdl
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_lp.cdl
@@ -16,18 +16,18 @@
 
 .SUBCKT sky130_fd_sc_lp__einvn_lp 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.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA net30 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z 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 net30 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
-MI5 net26 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 l=0.25 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 l=0.25 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 net30 TE_B 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
+MMN1 sndA 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
+MMIN1 net30 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
+MI5 net26 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 l=0.25 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 l=0.25 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net30 TE_B 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_lp__einvn_lp
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_lp.netlist.tsv b/cells/einvn/sky130_fd_sc_lp__einvn_lp.netlist.tsv
index fb53997..da09619 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_lp.netlist.tsv
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_lp.netlist.tsv
@@ -1,9 +1,9 @@
 sky130_fd_sc_lp__einvn_lp	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	net30	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net30	TE_B	net26	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net26	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net30	TE_B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	net30	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net30	TE_B	net26	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net26	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net30	TE_B	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/einvn/sky130_fd_sc_lp__einvn_lp.spice b/cells/einvn/sky130_fd_sc_lp__einvn_lp.spice
index 8d8bd7a..3bfc2d8 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_lp.spice
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_lp.spice
@@ -16,18 +16,11 @@
 
 
 .subckt sky130_fd_sc_lp__einvn_lp A TE_B VGND VNB VPB VPWR Z
-M1000 a_284_148# a_28_148# VGND VNB nshort w=420000u l=150000u
-+  ad=1.365e+11p pd=1.49e+06u as=1.407e+11p ps=1.51e+06u
-M1001 VGND TE_B a_115_148# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1002 a_252_414# TE_B VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=2.8e+11p ps=2.56e+06u
-M1003 a_115_148# TE_B a_28_148# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1004 VPWR TE_B a_28_148# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1005 Z A a_284_148# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1006 Z A a_252_414# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
+X0 VPWR TE_B a_252_414# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_284_148# A Z VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_252_414# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 VGND a_28_148# a_284_148# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_115_148# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_28_148# TE_B a_115_148# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_28_148# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_m.cdl b/cells/einvn/sky130_fd_sc_lp__einvn_m.cdl
index 19d5a9b..e2c84aa 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_m.cdl
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_m.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__einvn_m 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.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z 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 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=1 w=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=0.42 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=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TE TE_B VPB phighvt m=1 w=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=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 pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 TE TE_B VPB pfet_01v8_hvt m=1 w=0.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_lp__einvn_m
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_m.netlist.tsv b/cells/einvn/sky130_fd_sc_lp__einvn_m.netlist.tsv
index 0a8f702..ae9aba3 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_m.netlist.tsv
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_m.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__einvn_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	1	0.42	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	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TE	TE_B	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	1	0.42	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	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_m.spice b/cells/einvn/sky130_fd_sc_lp__einvn_m.spice
index 2ca8eeb..1bd1b0d 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_m.spice
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_m.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__einvn_m A TE_B VGND VNB VPB VPWR Z
-M1000 a_218_154# a_47_154# VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.218e+11p ps=1.42e+06u
-M1001 Z A a_218_154# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1002 VPWR TE_B a_47_154# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.113e+11p ps=1.37e+06u
-M1003 Z A a_232_535# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1004 VGND TE_B a_47_154# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 a_232_535# TE_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_47_154# TE_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VGND a_47_154# a_218_154# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR TE_B a_232_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_47_154# TE_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_218_154# A Z VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_232_535# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_0.cdl b/cells/einvp/sky130_fd_sc_lp__einvp_0.cdl
index 2b3b942..3ea3be4 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_0.cdl
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_0.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__einvp_0 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.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z 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 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.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 phighvt m=1 w=0.64 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=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 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=0.64 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=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 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_lp__einvp_0
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_0.netlist.tsv b/cells/einvp/sky130_fd_sc_lp__einvp_0.netlist.tsv
index d385548..d287436 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_0.netlist.tsv
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_0.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__einvp_0	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	1	0.42	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	1	0.64	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	1	0.42	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8_hvt	1	0.64	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_lp__einvp_0.spice b/cells/einvp/sky130_fd_sc_lp__einvp_0.spice
index ff95127..1546ef7 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_0.spice
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_0.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__einvp_0 A TE VGND VNB VPB VPWR Z
-M1000 VPWR TE a_32_70# VPB phighvt w=420000u l=150000u
-+  ad=2.158e+11p pd=2.03e+06u as=1.113e+11p ps=1.37e+06u
-M1001 Z A a_220_484# VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=1.536e+11p ps=1.76e+06u
-M1002 a_220_484# a_32_70# VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND TE a_32_70# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.113e+11p ps=1.37e+06u
-M1004 a_201_70# TE VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1005 Z A a_201_70# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 a_32_70# TE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VPWR a_32_70# a_220_484# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_32_70# TE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_220_484# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 a_201_70# A Z VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND TE a_201_70# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_1.cdl b/cells/einvp/sky130_fd_sc_lp__einvp_1.cdl
index dc28f87..72905e5 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_1.cdl
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-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.84 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_lp__einvp_1
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_1.netlist.tsv b/cells/einvp/sky130_fd_sc_lp__einvp_1.netlist.tsv
index 9f1c1f0..39881a0 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_1.netlist.tsv
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	1	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	1	0.84	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_lp__einvp_1.spice b/cells/einvp/sky130_fd_sc_lp__einvp_1.spice
index 0876fe2..6b6a5c9 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_1.spice
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__einvp_1 A TE VGND VNB VPB VPWR Z
-M1000 a_207_302# TE VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=3.175e+11p ps=2.78e+06u
-M1001 VGND TE a_128_47# VNB nshort w=840000u l=150000u
-+  ad=4.347e+11p pd=3.22e+06u as=2.016e+11p ps=2.16e+06u
-M1002 VPWR a_207_302# a_161_400# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.3e+11p ps=2.46e+06u
-M1003 a_128_47# A Z VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1004 a_207_302# TE VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1005 a_161_400# A Z VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
+X0 VGND TE a_207_302# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 Z A a_161_400# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 VPWR TE a_207_302# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_161_400# a_207_302# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_128_47# TE VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 Z A a_128_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_2.cdl b/cells/einvp/sky130_fd_sc_lp__einvp_2.cdl
index c55d091..e3432b5 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_2.cdl
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8 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
-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.84 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.26 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.26 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.26 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.26 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_lp__einvp_2
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_2.netlist.tsv b/cells/einvp/sky130_fd_sc_lp__einvp_2.netlist.tsv
index 0c3065b..def4fe5 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_2.netlist.tsv
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	2	0.84	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	2	1.26	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	2	0.84	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.26	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.26	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_lp__einvp_2.spice b/cells/einvp/sky130_fd_sc_lp__einvp_2.spice
index 1b81c7e..72f098d 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_2.spice
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__einvp_2 A TE VGND VNB VPB VPWR Z
-M1000 VGND TE a_30_131# VNB nshort w=420000u l=150000u
-+  ad=4.914e+11p pd=4.64e+06u as=1.113e+11p ps=1.37e+06u
-M1001 Z A a_249_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=1.0206e+12p ps=9.18e+06u
-M1002 a_218_47# A Z VNB nshort w=840000u l=150000u
-+  ad=6.804e+11p pd=6.66e+06u as=2.352e+11p ps=2.24e+06u
-M1003 VPWR a_30_131# a_249_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=5.224e+11p pd=4.89e+06u as=0p ps=0u
-M1004 a_218_47# TE VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_249_367# a_30_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR TE a_30_131# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1007 a_249_367# A Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND TE a_218_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Z A a_218_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_30_131# TE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR a_30_131# a_249_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_30_131# TE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_249_367# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_218_47# A Z VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 Z A a_218_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_249_367# a_30_131# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 Z A a_249_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND TE a_218_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_218_47# TE VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_4.cdl b/cells/einvp/sky130_fd_sc_lp__einvp_4.cdl
index 45172a4..cf862ae 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_4.cdl
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8 m=4 w=0.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA TE VNB nfet_01v8 m=4 w=0.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 TEB TE VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB phighvt m=4 w=1.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__einvp_4
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_4.netlist.tsv b/cells/einvp/sky130_fd_sc_lp__einvp_4.netlist.tsv
index ed7c742..99f346d 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_4.netlist.tsv
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TEB	TE	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TEB	TE	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	TEB	TE	VGND	VNB	nfet_01v8	1	0.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_4.spice b/cells/einvp/sky130_fd_sc_lp__einvp_4.spice
index 045b106..e3876d4 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_4.spice
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_lp__einvp_4 A TE VGND VNB VPB VPWR Z
-M1000 VPWR a_35_47# a_301_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0395e+12p pd=9.21e+06u as=2.268e+12p ps=1.62e+07u
-M1001 a_301_367# A Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1002 Z A a_301_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Z A a_204_47# VNB nshort w=840000u l=150000u
-+  ad=8.148e+11p pd=6.98e+06u as=9.408e+11p ps=8.96e+06u
-M1004 VPWR TE a_35_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1005 VGND TE a_204_47# VNB nshort w=840000u l=150000u
-+  ad=6.93e+11p pd=6.69e+06u as=0p ps=0u
-M1006 VGND TE a_204_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_35_47# a_301_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_204_47# A Z VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Z A a_301_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_301_367# A Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Z A a_204_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_301_367# a_35_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_204_47# A Z VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_204_47# TE VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_301_367# a_35_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND TE a_35_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1017 a_204_47# TE VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_301_367# a_35_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR a_35_47# a_301_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 Z A a_301_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND TE a_204_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_301_367# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_204_47# TE VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR a_35_47# a_301_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_204_47# A Z VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND TE a_204_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_204_47# TE VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_301_367# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 Z A a_204_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_35_47# TE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_204_47# A Z VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_301_367# a_35_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 Z A a_204_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_35_47# TE VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 Z A a_301_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_8.cdl b/cells/einvp/sky130_fd_sc_lp__einvp_8.cdl
index 5b0a17a..4ebca12 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_8.cdl
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_8.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z A VNB nfet_01v8 m=8 w=0.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA TE VNB nfet_01v8 m=8 w=0.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 TEB TE VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndTEB A VPB phighvt m=8 w=1.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__einvp_8
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_8.netlist.tsv b/cells/einvp/sky130_fd_sc_lp__einvp_8.netlist.tsv
index 41ac6a9..e33b270 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_8.netlist.tsv
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_8.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TEB	TE	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	VPWR	TEB	sndTEB	VPB	phighvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TEB	TE	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	TEB	TE	VGND	VNB	nfet_01v8	1	0.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_8.spice b/cells/einvp/sky130_fd_sc_lp__einvp_8.spice
index b37fa05..94df426 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_8.spice
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_8.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_lp__einvp_8 A TE VGND VNB VPB VPWR Z
-M1000 VPWR a_182_367# a_365_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7451e+12p pd=1.537e+07u as=3.1374e+12p ps=2.766e+07u
-M1001 VGND TE a_371_47# VNB nshort w=840000u l=150000u
-+  ad=1.1802e+12p pd=1.121e+07u as=2.0916e+12p ps=2.01e+07u
-M1002 a_371_47# A Z VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=9.408e+11p ps=8.96e+06u
-M1003 a_365_367# A Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.4112e+12p ps=1.232e+07u
-M1004 a_371_47# TE VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_182_367# a_365_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Z A a_365_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_365_367# a_182_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Z A a_371_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Z A a_365_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND TE a_371_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Z A a_371_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Z A a_365_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_365_367# A Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND TE a_371_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Z A a_371_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_365_367# a_182_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_371_47# TE VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_365_367# A Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_365_367# a_182_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR a_182_367# a_365_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_365_367# a_182_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_371_47# A Z VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Z A a_365_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_371_47# TE VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_371_47# A Z VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_182_367# TE VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1027 a_182_367# TE VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1028 a_371_47# TE VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_371_47# A Z VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND TE a_371_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Z A a_371_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_365_367# A Z VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR a_182_367# a_365_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND TE a_371_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_371_47# A Z VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 Z A a_365_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_365_367# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 Z A a_371_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_365_367# a_182_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VPWR a_182_367# a_365_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_365_367# a_182_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_371_47# TE VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VGND TE a_371_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VGND TE a_371_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VPWR TE a_182_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VGND TE a_182_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_371_47# A Z VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_365_367# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_371_47# TE VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 Z A a_365_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 VGND TE a_371_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_371_47# TE VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 a_371_47# A Z VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 a_365_367# a_182_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 VPWR a_182_367# a_365_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 Z A a_371_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 VPWR a_182_367# a_365_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 a_365_367# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 Z A a_365_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 VPWR a_182_367# a_365_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 a_365_367# a_182_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 a_371_47# A Z VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 Z A a_371_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X30 Z A a_365_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 a_365_367# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X32 a_371_47# TE VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X33 Z A a_371_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_lp.cdl b/cells/einvp/sky130_fd_sc_lp__einvp_lp.cdl
index a913fe6..ba1be35 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_lp.cdl
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_lp.cdl
@@ -16,18 +16,18 @@
 
 .SUBCKT sky130_fd_sc_lp__einvp_lp 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.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z 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 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net35 TE VNB nshort m=1 w=0.42 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
-MMP0 VPWR TEB VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI5 net35 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 l=0.25 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR TEB 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
+MMP1 sndTEB A 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
+MMIP1 TEB TE 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_lp__einvp_lp
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_lp.netlist.tsv b/cells/einvp/sky130_fd_sc_lp__einvp_lp.netlist.tsv
index 0737f46..cbfabeb 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_lp.netlist.tsv
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_lp.netlist.tsv
@@ -1,9 +1,9 @@
 sky130_fd_sc_lp__einvp_lp	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	TEB	TE	net35	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net35	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	TEB	TE	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Z	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	TEB	TE	net35	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net35	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	TEB	TE	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/einvp/sky130_fd_sc_lp__einvp_lp.spice b/cells/einvp/sky130_fd_sc_lp__einvp_lp.spice
index 30c76b6..820bd15 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_lp.spice
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_lp.spice
@@ -16,18 +16,11 @@
 
 
 .subckt sky130_fd_sc_lp__einvp_lp A TE VGND VNB VPB VPWR Z
-M1000 a_182_321# TE a_314_101# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VPWR a_182_321# a_134_419# VPB phighvt w=1e+06u l=250000u
-+  ad=5.65e+11p pd=3.13e+06u as=2.4e+11p ps=2.48e+06u
-M1002 a_314_101# TE VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.862e+11p ps=1.96e+06u
-M1003 a_182_321# TE VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1004 VGND TE a_134_141# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1005 a_134_141# A Z VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.6345e+11p ps=1.64e+06u
-M1006 a_134_419# A Z VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
+X0 a_314_101# TE a_182_321# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 Z A a_134_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_134_419# a_182_321# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 VGND TE a_314_101# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_134_141# TE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 Z A a_134_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR TE a_182_321# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_m.cdl b/cells/einvp/sky130_fd_sc_lp__einvp_m.cdl
index 02fa049..e0a07fd 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_m.cdl
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_m.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__einvp_m 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.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA TE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Z 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 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.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 phighvt m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 TEB TE VPB phighvt m=1 w=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=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 pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 TEB TE VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__einvp_m
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_m.netlist.tsv b/cells/einvp/sky130_fd_sc_lp__einvp_m.netlist.tsv
index f0b130f..504b519 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_m.netlist.tsv
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_m.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__einvp_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	TE	VGND	VNB	nshort	1	0.42	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndTEB	A	Z	VPB	phighvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	TE	VGND	VNB	nfet_01v8	1	0.42	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndTEB	A	Z	VPB	pfet_01v8_hvt	1	0.42	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_lp__einvp_m.spice b/cells/einvp/sky130_fd_sc_lp__einvp_m.spice
index 76a6871..c818d86 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_m.spice
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_m.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__einvp_m A TE VGND VNB VPB VPWR Z
-M1000 a_227_535# a_42_129# VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1001 VGND TE a_42_129# VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=1.113e+11p ps=1.37e+06u
-M1002 Z A a_227_535# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1003 Z A a_227_129# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1004 a_227_129# TE VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR TE a_42_129# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 a_227_129# A Z VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR a_42_129# a_227_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_227_535# A Z VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VGND TE a_227_129# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_42_129# TE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_42_129# TE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/fa/sky130_fd_sc_lp__fa_0.cdl b/cells/fa/sky130_fd_sc_lp__fa_0.cdl
index cd3502f..94353db 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_0.cdl
+++ b/cells/fa/sky130_fd_sc_lp__fa_0.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_lp__fa_0 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
-MMIN2 COUT majb VNB nshort m=1 w=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 SUM sumb VNB nshort m=1 w=0.42 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.42 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.42 l=0.15 mult=1 sa=0.265
+MMIN2 COUT majb VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MMIN3 SUM sumb VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MMNmaj10 majb 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
-MMNmaj20 VGND 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
-MMNs2s0 VGND 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
-MMNs2s1 sndNAn4 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNmaj11 sndNAp1 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
-MMNs2s2 sndNBn4 CIN VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNmaj30 majb CIN VNB nfet_01v8 m=1 w=0.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265
+MMNmaj31 sndNCINn3 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
-MMNs1s nint1 majb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNmaj20 VGND 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 COUT majb 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
-MMIP3 SUM sumb 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
-MMPmaj10 VPWR 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
-MMPmaj11 sndPAp1 B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNs2s0 VGND 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
-MMPmaj20 VPWR 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
-MMPmaj21 sndPCINp3 CIN VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNs2s1 sndNAn4 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
-MMPmaj31 sndPCINp3 B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNs2s2 sndNBn4 CIN VNB nfet_01v8 m=1 w=0.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265
+MMNs3s0 nint1 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
-MMPs2s2 sndPBp4 CIN VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNs3s1 nint1 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
-MMPs3s0 pint1 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
-MMPs3s1 pint1 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
-MMPs3s2 pint1 CIN VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNs3s2 nint1 CIN VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265
+MMNs1s nint1 majb VNB nfet_01v8 m=1 w=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 COUT majb 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
+MMIP3 SUM sumb 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
+MMPmaj10 VPWR 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
+MMPmaj11 sndPAp1 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
+MMPmaj20 VPWR 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
+MMPmaj21 sndPCINp3 CIN VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=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_lp__fa_0
diff --git a/cells/fa/sky130_fd_sc_lp__fa_0.netlist.tsv b/cells/fa/sky130_fd_sc_lp__fa_0.netlist.tsv
index 8efa9fb..e28cd61 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_0.netlist.tsv
+++ b/cells/fa/sky130_fd_sc_lp__fa_0.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_lp__fa_0	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
-MMIN2	MOSFET	COUT	majb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj30	MOSFET	majb	CIN	sndNCINn3	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj31	MOSFET	sndNCINn3	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj20	MOSFET	VGND	A	sndNCINn3	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s0	MOSFET	nint1	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s1	MOSFET	nint1	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs1s	MOSFET	nint1	majb	sumb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj20	MOSFET	VPWR	A	sndPCINp3	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj21	MOSFET	sndPCINp3	CIN	majb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj31	MOSFET	sndPCINp3	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s0	MOSFET	pint1	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s1	MOSFET	pint1	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1s	MOSFET	pint1	majb	sumb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	majb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj30	MOSFET	majb	CIN	sndNCINn3	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj31	MOSFET	sndNCINn3	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj20	MOSFET	VGND	A	sndNCINn3	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s0	MOSFET	nint1	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s1	MOSFET	nint1	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1s	MOSFET	nint1	majb	sumb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	COUT	majb	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj20	MOSFET	VPWR	A	sndPCINp3	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj21	MOSFET	sndPCINp3	CIN	majb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj31	MOSFET	sndPCINp3	B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s0	MOSFET	pint1	B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s1	MOSFET	pint1	A	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs1s	MOSFET	pint1	majb	sumb	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/fa/sky130_fd_sc_lp__fa_0.spice b/cells/fa/sky130_fd_sc_lp__fa_0.spice
index 4efe3f7..40462fc 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_0.spice
+++ b/cells/fa/sky130_fd_sc_lp__fa_0.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_lp__fa_0 A B CIN VGND VNB VPB VPWR COUT SUM
-M1000 SUM a_1059_119# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=8.56e+11p ps=8.58e+06u
-M1001 VGND A a_1239_119# VNB nshort w=420000u l=150000u
-+  ad=7.1035e+11p pd=7.7e+06u as=1.989e+11p ps=2.16e+06u
-M1002 a_781_119# CIN VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=0p ps=0u
-M1003 a_224_119# A VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 a_781_457# CIN VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=0p ps=0u
-M1005 a_404_532# CIN a_80_225# VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=1.638e+11p ps=1.62e+06u
-M1006 SUM a_1059_119# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1007 VPWR a_80_225# COUT VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1008 a_781_457# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1239_457# B a_1161_457# VPB phighvt w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=1.008e+11p ps=1.32e+06u
-M1010 a_218_532# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1011 a_1059_119# a_80_225# a_781_119# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1012 a_1145_119# CIN a_1059_119# VNB nshort w=420000u l=150000u
-+  ad=1.344e+11p pd=1.48e+06u as=0p ps=0u
-M1013 a_781_119# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1239_119# B a_1145_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A a_1239_457# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_404_532# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND B a_781_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR B a_781_457# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1161_457# CIN a_1059_119# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.512e+11p ps=1.56e+06u
-M1020 a_80_225# B a_224_119# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1021 VPWR B a_404_532# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_382_119# CIN a_80_225# VNB nshort w=420000u l=150000u
-+  ad=2.457e+11p pd=2.85e+06u as=0p ps=0u
-M1023 a_382_119# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1059_119# a_80_225# a_781_457# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_80_225# B a_218_532# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_80_225# COUT VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1027 VGND B a_382_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A a_382_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_781_119# a_80_225# a_1059_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_781_457# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_224_119# B a_80_225# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR CIN a_781_457# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_781_119# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_382_119# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_1145_119# B a_1239_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_1059_119# CIN a_1161_457# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VPWR A a_218_532# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 VGND A a_224_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR a_1059_119# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 a_1059_119# CIN a_1145_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_80_225# CIN a_382_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_1239_457# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 VGND CIN a_781_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 COUT a_80_225# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_1161_457# B a_1239_457# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 a_781_457# a_80_225# a_1059_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 VPWR A a_404_532# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 VGND a_1059_119# SUM VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_80_225# CIN a_404_532# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 COUT a_80_225# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X23 VGND A a_781_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_218_532# B a_80_225# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X25 VPWR A a_781_457# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X26 a_1239_119# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_404_532# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/fa/sky130_fd_sc_lp__fa_1.cdl b/cells/fa/sky130_fd_sc_lp__fa_1.cdl
index 1ae94fd..91ead4f 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_1.cdl
+++ b/cells/fa/sky130_fd_sc_lp__fa_1.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_lp__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
-MMIN2 COUT majb VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 SUM sumb VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNmaj10 majb 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
-MMNmaj11 sndNAp1 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMIN2 COUT majb VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNmaj30 majb CIN VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMIN3 SUM sumb VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNmaj31 sndNCINn3 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNmaj10 majb 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
-MMNmaj20 VGND 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
-MMNs2s0 VGND 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
-MMNs2s1 sndNAn4 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNmaj11 sndNAp1 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
-MMNs2s2 sndNBn4 CIN VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNmaj30 majb CIN VNB nfet_01v8 m=1 w=0.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265
+MMNmaj31 sndNCINn3 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
-MMNs1s nint1 majb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNmaj20 VGND 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 COUT majb VPB phighvt m=1 w=1.26 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.26 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265
+MMNs2s0 VGND 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
-MMPmaj20 VPWR 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
-MMPmaj21 sndPCINp3 CIN VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNs2s1 sndNAn4 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
-MMPmaj31 sndPCINp3 B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNs2s2 sndNBn4 CIN VNB nfet_01v8 m=1 w=0.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265
+MMNs3s0 nint1 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
-MMPs2s2 sndPBp4 CIN VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNs3s1 nint1 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
-MMPs3s0 pint1 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
-MMPs3s1 pint1 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
-MMPs3s2 pint1 CIN VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNs3s2 nint1 CIN VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265
+MMNs1s nint1 majb VNB nfet_01v8 m=1 w=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 COUT majb VPB pfet_01v8_hvt m=1 w=1.26 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.26 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=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_lp__fa_1
diff --git a/cells/fa/sky130_fd_sc_lp__fa_1.netlist.tsv b/cells/fa/sky130_fd_sc_lp__fa_1.netlist.tsv
index e3ac0ab..f8064e2 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_1.netlist.tsv
+++ b/cells/fa/sky130_fd_sc_lp__fa_1.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_lp__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
-MMIN2	MOSFET	COUT	majb	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj30	MOSFET	majb	CIN	sndNCINn3	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj31	MOSFET	sndNCINn3	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj20	MOSFET	VGND	A	sndNCINn3	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s0	MOSFET	nint1	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s1	MOSFET	nint1	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs1s	MOSFET	nint1	majb	sumb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj20	MOSFET	VPWR	A	sndPCINp3	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj21	MOSFET	sndPCINp3	CIN	majb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj31	MOSFET	sndPCINp3	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s0	MOSFET	pint1	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s1	MOSFET	pint1	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1s	MOSFET	pint1	majb	sumb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	majb	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj30	MOSFET	majb	CIN	sndNCINn3	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj31	MOSFET	sndNCINn3	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj20	MOSFET	VGND	A	sndNCINn3	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s0	MOSFET	nint1	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s1	MOSFET	nint1	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1s	MOSFET	nint1	majb	sumb	VNB	nfet_01v8	1	0.42	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj20	MOSFET	VPWR	A	sndPCINp3	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj21	MOSFET	sndPCINp3	CIN	majb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj31	MOSFET	sndPCINp3	B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s0	MOSFET	pint1	B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s1	MOSFET	pint1	A	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs1s	MOSFET	pint1	majb	sumb	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/fa/sky130_fd_sc_lp__fa_1.spice b/cells/fa/sky130_fd_sc_lp__fa_1.spice
index ac52edf..f6f1585 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_1.spice
+++ b/cells/fa/sky130_fd_sc_lp__fa_1.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_lp__fa_1 A B CIN VGND VNB VPB VPWR COUT SUM
-M1000 a_1290_411# B a_1212_411# VPB phighvt w=420000u l=150000u
-+  ad=1.764e+11p pd=1.68e+06u as=1.008e+11p ps=1.32e+06u
-M1001 a_431_137# CIN a_80_27# VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=1.176e+11p ps=1.4e+06u
-M1002 a_854_411# B VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.478e+11p pd=2.86e+06u as=1.37165e+12p ps=1.195e+07u
-M1003 VPWR CIN a_854_411# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_231_457# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.47e+11p pd=1.54e+06u as=0p ps=0u
-M1005 VPWR A a_417_457# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.289e+11p ps=2.77e+06u
-M1006 a_267_137# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.0206e+12p ps=9.68e+06u
-M1007 a_818_83# A VGND VNB nshort w=420000u l=150000u
-+  ad=3.948e+11p pd=3.69e+06u as=0p ps=0u
-M1008 a_80_27# B a_231_457# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1009 VGND A a_1290_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=1.68e+06u
-M1010 a_854_411# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1212_411# CIN a_1118_411# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1012 a_417_457# B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 SUM a_1118_411# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1014 a_1290_125# B a_1212_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1015 a_417_457# CIN a_80_27# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_80_27# COUT VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1017 VPWR a_80_27# COUT VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1018 a_1118_411# a_80_27# a_854_411# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_1290_411# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND A a_431_137# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_431_137# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_818_83# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 SUM a_1118_411# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1024 VGND CIN a_818_83# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1118_411# a_80_27# a_818_83# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1026 a_80_27# B a_267_137# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1212_125# CIN a_1118_411# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 COUT a_80_27# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_417_457# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_1212_411# B a_1290_411# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VPWR A a_231_457# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VPWR A a_854_411# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_818_83# a_80_27# a_1118_411# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_854_411# CIN VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_431_137# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_1290_411# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_231_457# B a_80_27# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 VGND A a_267_137# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_1118_411# CIN a_1212_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND B a_431_137# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 COUT a_80_27# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_1118_411# CIN a_1212_411# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 VPWR B a_854_411# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 a_854_411# a_80_27# a_1118_411# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 a_267_137# B a_80_27# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_1212_125# B a_1290_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_818_83# CIN VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VPWR B a_417_457# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 a_1290_125# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_80_27# CIN a_417_457# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X23 VPWR a_1118_411# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 VGND A a_818_83# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 VGND a_1118_411# SUM VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 a_80_27# CIN a_431_137# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 VGND B a_818_83# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/fa/sky130_fd_sc_lp__fa_2.cdl b/cells/fa/sky130_fd_sc_lp__fa_2.cdl
index 0ab1aa8..bc9e11b 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_2.cdl
+++ b/cells/fa/sky130_fd_sc_lp__fa_2.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_lp__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
-MMIN2 COUT majb VNB nshort 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
-MMIN3 SUM sumb VNB nshort 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
-MMNmaj10 majb 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
-MMNmaj11 sndNAp1 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMIN2 COUT majb VNB nfet_01v8 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
-MMNmaj30 majb CIN VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMIN3 SUM sumb VNB nfet_01v8 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
-MMNmaj21 nmajmid A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNmaj10 majb 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
-MMNmaj20 VGND 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
-MMNs2s0 VGND 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
-MMNs2s1 sndNAn4 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNmaj11 sndNAp1 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
-MMNs2s2 sndNBn4 CIN VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNmaj30 majb CIN VNB nfet_01v8 m=1 w=0.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265
+MMNmaj21 nmajmid 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
-MMNs1s nint1 majb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNmaj20 VGND 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
-MMIP2 COUT majb VPB phighvt m=2 w=1.26 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.26 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=0.64 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=0.64 l=0.15 mult=1 sa=0.265
+MMNs2s0 VGND 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
-MMPmaj20 VPWR 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
-MMPmaj30 pmajmid CIN VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNs2s1 sndNAn4 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
-MMPmaj21 pmajmid A VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNs2s2 sndNBn4 CIN VNB nfet_01v8 m=1 w=0.42 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=0.64 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=0.64 l=0.15 mult=1 sa=0.265
+MMNs3s0 nint1 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
-MMPs2s2 sndPBp4 CIN VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNs3s1 nint1 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
-MMPs3s0 pint1 A 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
-MMPs3s1 pint1 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
-MMPs3s2 pint1 CIN VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNs3s2 nint1 CIN VNB nfet_01v8 m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265
+MMNs1s nint1 majb VNB nfet_01v8 m=1 w=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 COUT majb VPB pfet_01v8_hvt m=2 w=1.26 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.26 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=0.64 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=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 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
+MMPmaj30 pmajmid CIN 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
+MMPmaj21 pmajmid A 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
+MMPs2s0 VPWR A 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
+MMPs2s1 sndPAp4 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
+MMPs2s2 sndPBp4 CIN 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
+MMPs3s0 pint1 A 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
+MMPs3s1 pint1 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
+MMPs3s2 pint1 CIN 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
+MMPs1s pint1 majb 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_lp__fa_2
diff --git a/cells/fa/sky130_fd_sc_lp__fa_2.netlist.tsv b/cells/fa/sky130_fd_sc_lp__fa_2.netlist.tsv
index b977f98..82e8fa3 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_2.netlist.tsv
+++ b/cells/fa/sky130_fd_sc_lp__fa_2.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_lp__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
-MMIN2	MOSFET	COUT	majb	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj30	MOSFET	majb	CIN	nmajmid	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj21	MOSFET	nmajmid	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj20	MOSFET	VGND	B	nmajmid	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s0	MOSFET	nint1	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s1	MOSFET	nint1	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs1s	MOSFET	nint1	majb	sumb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj20	MOSFET	VPWR	B	pmajmid	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj30	MOSFET	pmajmid	CIN	majb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj21	MOSFET	pmajmid	A	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s0	MOSFET	pint1	A	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s1	MOSFET	pint1	B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1s	MOSFET	pint1	majb	sumb	VPB	phighvt	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	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj30	MOSFET	majb	CIN	nmajmid	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj21	MOSFET	nmajmid	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj20	MOSFET	VGND	B	nmajmid	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s0	MOSFET	nint1	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s1	MOSFET	nint1	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1s	MOSFET	nint1	majb	sumb	VNB	nfet_01v8	1	0.42	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj20	MOSFET	VPWR	B	pmajmid	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj30	MOSFET	pmajmid	CIN	majb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj21	MOSFET	pmajmid	A	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s0	MOSFET	pint1	A	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s1	MOSFET	pint1	B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs1s	MOSFET	pint1	majb	sumb	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/fa/sky130_fd_sc_lp__fa_2.spice b/cells/fa/sky130_fd_sc_lp__fa_2.spice
index f91a61d..eb44784 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_2.spice
+++ b/cells/fa/sky130_fd_sc_lp__fa_2.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_lp__fa_2 A B CIN VGND VNB VPB VPWR COUT SUM
-M1000 a_941_419# B VPWR VPB phighvt w=640000u l=150000u
-+  ad=5.4185e+11p pd=4.39e+06u as=2.4209e+12p ps=1.786e+07u
-M1001 VGND A a_309_131# VNB nshort w=420000u l=150000u
-+  ad=1.7743e+12p pd=1.445e+07u as=3.5865e+11p ps=3.49e+06u
-M1002 a_710_119# A VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1003 COUT a_395_398# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1004 COUT a_395_398# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1005 VPWR CIN a_941_419# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_395_398# B a_1653_137# VNB nshort w=420000u l=150000u
-+  ad=2.625e+11p pd=2.93e+06u as=8.82e+10p ps=1.26e+06u
-M1007 VGND a_84_21# SUM VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1008 SUM a_84_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1653_137# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_710_419# A VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1011 a_395_398# CIN a_309_398# VPB phighvt w=640000u l=150000u
-+  ad=3.648e+11p pd=3.7e+06u as=3.488e+11p ps=3.65e+06u
-M1012 VPWR A a_309_398# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_782_419# B a_710_419# VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1014 a_395_398# B a_1653_367# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.7e+06u
-M1015 VGND CIN a_940_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1016 VGND a_395_398# COUT VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_84_21# CIN a_782_419# VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1018 a_395_398# CIN a_309_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_84_21# CIN a_782_119# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=8.82e+10p ps=1.26e+06u
-M1020 SUM a_84_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1021 VPWR A a_941_419# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_940_119# a_395_398# a_84_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_309_131# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_940_119# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1653_367# A VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND A a_940_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_309_398# B VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR a_395_398# COUT VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_782_119# B a_710_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR a_84_21# SUM VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_941_419# a_395_398# a_84_21# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_395_398# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_782_119# CIN a_84_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR A a_710_419# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 VGND a_84_21# SUM VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_710_419# B a_782_419# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_782_419# CIN a_84_21# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 VPWR A a_1653_367# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 a_309_131# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR B a_309_398# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 a_710_119# B a_782_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_84_21# a_395_398# a_940_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_1653_137# B a_395_398# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VPWR B a_941_419# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 VGND A a_710_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_84_21# a_395_398# a_941_419# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X15 SUM a_84_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_309_131# CIN a_395_398# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_309_398# CIN a_395_398# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 a_309_398# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 a_940_119# CIN VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VPWR a_84_21# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 a_1653_367# B a_395_398# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 a_941_419# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X23 VGND B a_940_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 SUM a_84_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 VGND a_395_398# COUT VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 a_941_419# CIN VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X27 COUT a_395_398# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X28 VGND B a_309_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_940_119# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 VGND A a_1653_137# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 COUT a_395_398# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/fa/sky130_fd_sc_lp__fa_4.cdl b/cells/fa/sky130_fd_sc_lp__fa_4.cdl
index a7e7768..ee8cf46 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_4.cdl
+++ b/cells/fa/sky130_fd_sc_lp__fa_4.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_lp__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
-MMIN2 COUT majb VNB nshort m=4 w=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 sumb VNB nshort m=4 w=0.84 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.42 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.42 l=0.15 mult=1 sa=0.265
+MMIN2 COUT majb VNB nfet_01v8 m=4 w=0.84 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.42 l=0.15 mult=1 sa=0.265
+MMIN3 SUM sumb VNB nfet_01v8 m=4 w=0.84 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.42 l=0.15 mult=1 sa=0.265
+MMNmaj10 majb 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
-MMNmaj20 VGND 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
-MMNs2s0 VGND 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
-MMNs2s1 sndNAn4 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNmaj11 sndNAp1 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
-MMNs2s2 sndNBn4 CIN VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNmaj30 majb CIN VNB nfet_01v8 m=1 w=0.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265
+MMNmaj21 nmajmid 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
-MMNs1s nint1 majb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNmaj20 VGND 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
-MMIP2 COUT majb VPB phighvt m=4 w=1.26 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.26 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=0.64 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=0.64 l=0.15 mult=1 sa=0.265
+MMNs2s0 VGND 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
-MMPmaj20 VPWR 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
-MMPmaj30 pmajmid CIN VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNs2s1 sndNAn4 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
-MMPmaj21 pmajmid A VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNs2s2 sndNBn4 CIN VNB nfet_01v8 m=1 w=0.42 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=0.64 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=0.64 l=0.15 mult=1 sa=0.265
+MMNs3s0 nint1 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
-MMPs2s2 sndPBp4 CIN VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNs3s1 nint1 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
-MMPs3s0 pint1 A 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
-MMPs3s1 pint1 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
-MMPs3s2 pint1 CIN VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNs3s2 nint1 CIN VNB nfet_01v8 m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265
+MMNs1s nint1 majb VNB nfet_01v8 m=1 w=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 COUT majb VPB pfet_01v8_hvt m=4 w=1.26 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.26 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=0.64 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=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 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
+MMPmaj30 pmajmid CIN 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
+MMPmaj21 pmajmid A 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
+MMPs2s0 VPWR A 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
+MMPs2s1 sndPAp4 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
+MMPs2s2 sndPBp4 CIN 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
+MMPs3s0 pint1 A 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
+MMPs3s1 pint1 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
+MMPs3s2 pint1 CIN 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
+MMPs1s pint1 majb 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_lp__fa_4
diff --git a/cells/fa/sky130_fd_sc_lp__fa_4.netlist.tsv b/cells/fa/sky130_fd_sc_lp__fa_4.netlist.tsv
index edc6a0a..8d3a70d 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_4.netlist.tsv
+++ b/cells/fa/sky130_fd_sc_lp__fa_4.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_lp__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
-MMIN2	MOSFET	COUT	majb	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj30	MOSFET	majb	CIN	nmajmid	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj21	MOSFET	nmajmid	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj20	MOSFET	VGND	B	nmajmid	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s0	MOSFET	nint1	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s1	MOSFET	nint1	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs1s	MOSFET	nint1	majb	sumb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj20	MOSFET	VPWR	B	pmajmid	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj30	MOSFET	pmajmid	CIN	majb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj21	MOSFET	pmajmid	A	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s0	MOSFET	pint1	A	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s1	MOSFET	pint1	B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1s	MOSFET	pint1	majb	sumb	VPB	phighvt	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	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj30	MOSFET	majb	CIN	nmajmid	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj21	MOSFET	nmajmid	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj20	MOSFET	VGND	B	nmajmid	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s0	MOSFET	nint1	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s1	MOSFET	nint1	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1s	MOSFET	nint1	majb	sumb	VNB	nfet_01v8	1	0.42	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj20	MOSFET	VPWR	B	pmajmid	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj30	MOSFET	pmajmid	CIN	majb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj21	MOSFET	pmajmid	A	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s0	MOSFET	pint1	A	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s1	MOSFET	pint1	B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs1s	MOSFET	pint1	majb	sumb	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/fa/sky130_fd_sc_lp__fa_4.spice b/cells/fa/sky130_fd_sc_lp__fa_4.spice
index 3dd9a5b..1136868 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_4.spice
+++ b/cells/fa/sky130_fd_sc_lp__fa_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__fa_4 A B CIN VGND VNB VPB VPWR COUT SUM
-M1000 VPWR a_884_131# SUM VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.4398e+12p pd=2.141e+07u as=7.056e+11p ps=6.16e+06u
-M1001 a_978_131# CIN a_884_131# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.344e+11p ps=1.48e+06u
-M1002 a_1050_419# B a_978_419# VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=1.344e+11p ps=1.7e+06u
-M1003 VGND A a_1050_131# VNB nshort w=420000u l=150000u
-+  ad=1.7262e+12p pd=1.636e+07u as=8.82e+10p ps=1.26e+06u
-M1004 SUM a_884_131# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1005 a_37_131# B VGND VNB nshort w=420000u l=150000u
-+  ad=2.709e+11p pd=2.97e+06u as=0p ps=0u
-M1006 VPWR A a_445_419# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.7e+06u
-M1007 a_978_419# CIN a_884_131# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.048e+11p ps=1.92e+06u
-M1008 a_1050_131# B a_978_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B a_604_419# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.584e+11p ps=3.68e+06u
-M1010 VPWR a_328_131# COUT VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1011 a_27_440# B VPWR VPB phighvt w=640000u l=150000u
-+  ad=5.2225e+11p pd=4.32e+06u as=0p ps=0u
-M1012 a_884_131# a_328_131# a_604_419# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 SUM a_884_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_328_131# COUT VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1015 VGND a_328_131# COUT VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A a_414_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1017 VGND a_884_131# SUM VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 SUM a_884_131# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_445_419# B a_328_131# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.784e+11p ps=2.15e+06u
-M1020 SUM a_884_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_884_131# SUM VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 COUT a_328_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR a_328_131# COUT VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_328_131# CIN a_27_440# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_328_131# CIN a_37_131# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1026 a_604_419# CIN VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_884_131# SUM VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_414_131# B a_328_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR A a_1050_419# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND A a_37_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_604_419# A VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_604_131# CIN VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=0p ps=0u
-M1033 VGND B a_604_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 COUT a_328_131# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_604_131# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 COUT a_328_131# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 COUT a_328_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR A a_27_440# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_884_131# a_328_131# a_604_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_884_131# CIN a_978_419# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_978_419# B a_1050_419# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 COUT a_328_131# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR a_328_131# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 COUT a_328_131# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 SUM a_884_131# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR A a_604_419# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 VGND B a_37_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR CIN a_604_419# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 COUT a_328_131# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR a_328_131# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_37_131# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_37_131# CIN a_328_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_27_440# CIN a_328_131# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 VGND CIN a_604_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VGND A a_604_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_978_131# B a_1050_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VPWR B a_27_440# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 a_604_419# a_328_131# a_884_131# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 a_414_131# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VGND a_884_131# SUM VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 a_884_131# CIN a_978_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 SUM a_884_131# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_328_131# B a_445_419# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X24 VGND a_328_131# COUT VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 a_604_419# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X26 a_27_440# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X27 a_1050_419# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X28 VPWR a_884_131# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 SUM a_884_131# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 a_328_131# B a_414_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_604_131# a_328_131# a_884_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 VGND a_884_131# SUM VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X33 a_604_131# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_1050_131# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 COUT a_328_131# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X36 SUM a_884_131# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X37 VGND a_328_131# COUT VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X38 VPWR a_884_131# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X39 a_445_419# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/fa/sky130_fd_sc_lp__fa_lp.cdl b/cells/fa/sky130_fd_sc_lp__fa_lp.cdl
index 7fb1014..e686f43 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_lp.cdl
+++ b/cells/fa/sky130_fd_sc_lp__fa_lp.cdl
@@ -16,64 +16,64 @@
 
 .SUBCKT sky130_fd_sc_lp__fa_lp 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
-MMIN2 COUT majb VNB nshort m=1 w=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 SUM sumb VNB nshort m=1 w=0.42 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.42 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.42 l=0.15 mult=1 sa=0.265
+MMIN2 COUT majb VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MMIN3 SUM sumb VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MMNmaj10 majb 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
-MMNmaj20 VGND 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
-MMNs2s0 VGND 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
-MMNs2s1 sndNAn4 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNmaj11 sndNAp1 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
-MMNs2s2 sndNBn4 CIN VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNmaj30 majb CIN VNB nfet_01v8 m=1 w=0.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265
+MMNmaj31 sndNCINn3 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
-MMNs1s nint1 majb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNmaj20 VGND 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
-MI12 net113 majb VNB nshort m=1 w=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 net109 sumb VNB nshort m=1 w=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 COUT majb 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
-MMIP3 SUM sumb 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
-MMPmaj10 VPWR A 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
-MMPmaj11 sndPAp1 B 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
-MMPmaj20 VPWR A 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
-MMPmaj21 sndPCINp3 CIN VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265
+MMNs2s0 VGND 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
-MMPmaj31 sndPCINp3 B VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265
+MMNs2s1 sndNAn4 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
-MMPs2s0 VPWR A 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
-MMPs2s1 sndPAp4 B 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
-MMPs2s2 sndPBp4 CIN VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265
+MMNs2s2 sndNBn4 CIN VNB nfet_01v8 m=1 w=0.42 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMNs3s0 nint1 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
+MMNs3s1 nint1 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
+MMNs3s2 nint1 CIN VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNs1s nint1 majb VNB nfet_01v8 m=1 w=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 net113 majb VNB nfet_01v8 m=1 w=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 net109 sumb VNB nfet_01v8 m=1 w=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 COUT majb 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
+MMIP3 SUM sumb 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
+MMPmaj10 VPWR A 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
+MMPmaj11 sndPAp1 B 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
+MMPmaj20 VPWR A 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
+MMPmaj21 sndPCINp3 CIN 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
+MMPmaj31 sndPCINp3 B 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
+MMPs2s0 VPWR A 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
+MMPs2s1 sndPAp4 B 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
+MMPs2s2 sndPBp4 CIN 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
+MMPs3s0 pint1 B 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
+MMPs3s1 pint1 A 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
+MMPs3s2 pint1 CIN 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
+MMPs1s pint1 majb 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_lp__fa_lp
diff --git a/cells/fa/sky130_fd_sc_lp__fa_lp.netlist.tsv b/cells/fa/sky130_fd_sc_lp__fa_lp.netlist.tsv
index 7d6c19b..e4c8ed5 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_lp.netlist.tsv
+++ b/cells/fa/sky130_fd_sc_lp__fa_lp.netlist.tsv
@@ -1,32 +1,32 @@
 sky130_fd_sc_lp__fa_lp	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
-MMIN2	MOSFET	COUT	majb	net113	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	net109	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj30	MOSFET	majb	CIN	sndNCINn3	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj31	MOSFET	sndNCINn3	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj20	MOSFET	VGND	A	sndNCINn3	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s0	MOSFET	nint1	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s1	MOSFET	nint1	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs1s	MOSFET	nint1	majb	sumb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net113	majb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	net109	sumb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj20	MOSFET	VPWR	A	sndPCINp3	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj21	MOSFET	sndPCINp3	CIN	majb	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj31	MOSFET	sndPCINp3	B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s0	MOSFET	pint1	B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s1	MOSFET	pint1	A	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1s	MOSFET	pint1	majb	sumb	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	majb	net113	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	net109	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj30	MOSFET	majb	CIN	sndNCINn3	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj31	MOSFET	sndNCINn3	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj20	MOSFET	VGND	A	sndNCINn3	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s0	MOSFET	nint1	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s1	MOSFET	nint1	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1s	MOSFET	nint1	majb	sumb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net113	majb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	net109	sumb	VGND	VNB	nfet_01v8	1	0.42	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj20	MOSFET	VPWR	A	sndPCINp3	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj21	MOSFET	sndPCINp3	CIN	majb	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj31	MOSFET	sndPCINp3	B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s0	MOSFET	pint1	B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s1	MOSFET	pint1	A	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs1s	MOSFET	pint1	majb	sumb	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/fa/sky130_fd_sc_lp__fa_lp.spice b/cells/fa/sky130_fd_sc_lp__fa_lp.spice
index dbfddc3..6e94cce 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_lp.spice
+++ b/cells/fa/sky130_fd_sc_lp__fa_lp.spice
@@ -16,64 +16,34 @@
 
 
 .subckt sky130_fd_sc_lp__fa_lp A B CIN VGND VNB VPB VPWR COUT SUM
-M1000 a_1049_419# B VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=5.6e+11p pd=5.12e+06u as=2.64e+12p ps=1.528e+07u
-M1001 SUM a_1574_141# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1002 a_355_141# CIN a_84_209# VNB nshort w=420000u l=150000u
-+  ad=4.4395e+11p pd=4.02e+06u as=1.764e+11p ps=1.68e+06u
-M1003 a_1049_419# A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND CIN a_1005_141# VNB nshort w=420000u l=150000u
-+  ad=1.44145e+12p pd=1.129e+07u as=4.0825e+11p ps=3.85e+06u
-M1005 VGND a_84_209# a_134_85# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1006 a_1956_66# a_1574_141# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1007 a_84_209# B a_577_141# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1008 a_1005_141# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1720_419# CIN a_1574_141# VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=2.8e+11p ps=2.56e+06u
-M1010 a_1574_141# a_84_209# a_1005_141# VNB nshort w=420000u l=150000u
-+  ad=1.722e+11p pd=1.66e+06u as=0p ps=0u
-M1011 a_84_209# B a_245_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.8e+11p pd=2.56e+06u as=7.45e+11p ps=5.49e+06u
-M1012 a_1764_141# B a_1686_141# VNB nshort w=420000u l=150000u
-+  ad=2.02125e+11p pd=2.24e+06u as=1.008e+11p ps=1.32e+06u
-M1013 VGND A a_1764_141# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_84_209# COUT VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1015 VGND B a_355_141# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR B a_458_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=6.65e+11p ps=5.33e+06u
-M1017 VPWR A a_1818_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1018 a_134_85# a_84_209# COUT VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1019 VGND A a_355_141# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_577_141# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_458_409# A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1686_141# CIN a_1574_141# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1574_141# a_84_209# a_1049_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1005_141# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1818_419# B a_1720_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 SUM a_1574_141# a_1956_66# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1027 a_458_409# CIN a_84_209# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR CIN a_1049_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR A a_245_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1049_419# CIN VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_84_209# CIN a_458_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_1720_419# B a_1818_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 VPWR A a_458_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_1005_141# CIN VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_1574_141# CIN a_1686_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_1574_141# a_1956_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_1574_141# CIN a_1720_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 VPWR a_1574_141# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_1956_66# a_1574_141# SUM VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_458_409# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 VGND A a_1005_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_1049_419# a_84_209# a_1574_141# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X13 a_1686_141# B a_1764_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VGND A a_577_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 COUT a_84_209# a_134_85# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_245_409# B a_84_209# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X17 a_134_85# a_84_209# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 COUT a_84_209# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X19 a_245_409# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X20 VPWR A a_1049_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X21 a_1764_141# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_1005_141# a_84_209# a_1574_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_577_141# B a_84_209# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VGND B a_1005_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_355_141# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_355_141# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_1818_419# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X28 a_84_209# CIN a_355_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 VPWR B a_1049_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/fa/sky130_fd_sc_lp__fa_m.cdl b/cells/fa/sky130_fd_sc_lp__fa_m.cdl
index 3f44bb0..6ad618c 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_m.cdl
+++ b/cells/fa/sky130_fd_sc_lp__fa_m.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_lp__fa_m 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
-MMIN2 COUT majb VNB nshort m=1 w=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 SUM sumb VNB nshort m=1 w=0.42 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.42 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.42 l=0.15 mult=1 sa=0.265
+MMIN2 COUT majb VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MMIN3 SUM sumb VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MMNmaj10 majb 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
-MMNmaj20 VGND 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
-MMNs2s0 VGND 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
-MMNs2s1 sndNAn4 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNmaj11 sndNAp1 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
-MMNs2s2 sndNBn4 CIN VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNmaj30 majb CIN VNB nfet_01v8 m=1 w=0.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265
+MMNmaj21 nmajmid 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
-MMNs1s nint1 majb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNmaj20 VGND 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
-MMIP2 COUT majb VPB phighvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265
+MMNs2s0 VGND 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
-MMPmaj20 VPWR 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
-MMPmaj30 pmajmid CIN VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNs2s1 sndNAn4 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
-MMPmaj21 pmajmid A VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNs2s2 sndNBn4 CIN VNB nfet_01v8 m=1 w=0.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265
+MMNs3s0 nint1 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
-MMPs2s2 sndPBp4 CIN VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNs3s1 nint1 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
-MMPs3s0 pint1 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
-MMPs3s1 pint1 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
-MMPs3s2 pint1 CIN VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNs3s2 nint1 CIN VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265
+MMNs1s nint1 majb VNB nfet_01v8 m=1 w=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 COUT majb VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=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_lp__fa_m
diff --git a/cells/fa/sky130_fd_sc_lp__fa_m.netlist.tsv b/cells/fa/sky130_fd_sc_lp__fa_m.netlist.tsv
index 7abef76..06732c8 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_m.netlist.tsv
+++ b/cells/fa/sky130_fd_sc_lp__fa_m.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_lp__fa_m	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
-MMIN2	MOSFET	COUT	majb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj30	MOSFET	majb	CIN	nmajmid	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj21	MOSFET	nmajmid	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNmaj20	MOSFET	VGND	B	nmajmid	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s0	MOSFET	nint1	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s1	MOSFET	nint1	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs1s	MOSFET	nint1	majb	sumb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj20	MOSFET	VPWR	B	pmajmid	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj30	MOSFET	pmajmid	CIN	majb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPmaj21	MOSFET	pmajmid	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s0	MOSFET	pint1	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s1	MOSFET	pint1	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1s	MOSFET	pint1	majb	sumb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	majb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj10	MOSFET	majb	B	sndNAp1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj11	MOSFET	sndNAp1	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj30	MOSFET	majb	CIN	nmajmid	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj21	MOSFET	nmajmid	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNmaj20	MOSFET	VGND	B	nmajmid	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s0	MOSFET	VGND	A	sndNAn4	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s1	MOSFET	sndNAn4	B	sndNBn4	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs2s2	MOSFET	sndNBn4	CIN	sumb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s0	MOSFET	nint1	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s1	MOSFET	nint1	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs3s2	MOSFET	nint1	CIN	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1s	MOSFET	nint1	majb	sumb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	COUT	majb	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj10	MOSFET	VPWR	A	sndPAp1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj11	MOSFET	sndPAp1	B	majb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj20	MOSFET	VPWR	B	pmajmid	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj30	MOSFET	pmajmid	CIN	majb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPmaj21	MOSFET	pmajmid	A	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s0	MOSFET	VPWR	A	sndPAp4	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s1	MOSFET	sndPAp4	B	sndPBp4	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs2s2	MOSFET	sndPBp4	CIN	sumb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s0	MOSFET	pint1	A	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s1	MOSFET	pint1	B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs3s2	MOSFET	pint1	CIN	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs1s	MOSFET	pint1	majb	sumb	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/fa/sky130_fd_sc_lp__fa_m.spice b/cells/fa/sky130_fd_sc_lp__fa_m.spice
index fe40078..a07c262 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_m.spice
+++ b/cells/fa/sky130_fd_sc_lp__fa_m.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_lp__fa_m A B CIN VGND VNB VPB VPWR COUT SUM
-M1000 a_1195_119# CIN a_1101_119# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.344e+11p ps=1.48e+06u
-M1001 SUM a_1101_119# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.338e+11p ps=8.22e+06u
-M1002 a_227_367# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1003 a_843_391# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=0p ps=0u
-M1004 a_385_367# B VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=0p ps=0u
-M1005 a_80_241# B a_227_367# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1006 a_843_391# B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_80_241# B a_227_125# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=8.82e+10p ps=1.26e+06u
-M1008 a_385_125# CIN a_80_241# VNB nshort w=420000u l=150000u
-+  ad=2.625e+11p pd=2.93e+06u as=0p ps=0u
-M1009 a_385_125# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=6.468e+11p ps=7.28e+06u
-M1010 VPWR A a_385_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1195_391# CIN a_1101_119# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.344e+11p ps=1.48e+06u
-M1012 VGND A a_1267_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1013 a_227_125# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR CIN a_843_391# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1267_391# B a_1195_391# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1016 a_1101_119# a_80_241# a_843_391# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND CIN a_843_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1018 a_843_119# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 SUM a_1101_119# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1020 VPWR A a_1267_391# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_80_241# COUT VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1022 a_1267_119# B a_1195_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_843_119# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR a_80_241# COUT VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1025 a_385_367# CIN a_80_241# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND A a_385_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1101_119# a_80_241# a_843_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A a_843_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_385_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VGND a_1101_119# SUM VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 COUT a_80_241# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_1101_119# CIN a_1195_391# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_1195_391# B a_1267_391# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_1267_391# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_227_125# B a_80_241# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_1267_119# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 COUT a_80_241# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_843_391# CIN VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_385_125# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VPWR B a_385_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 VGND A a_227_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VGND B a_843_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_1195_119# B a_1267_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VGND B a_385_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VPWR A a_227_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 a_227_367# B a_80_241# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 a_80_241# CIN a_385_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_843_391# a_80_241# a_1101_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 VPWR A a_843_391# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 a_1101_119# CIN a_1195_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_843_119# CIN VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_80_241# CIN a_385_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X25 a_843_119# a_80_241# a_1101_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VPWR B a_843_391# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X27 VPWR a_1101_119# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/fah/sky130_fd_sc_lp__fah_1.cdl b/cells/fah/sky130_fd_sc_lp__fah_1.cdl
index 29b13c0..b348b8c 100644
--- a/cells/fah/sky130_fd_sc_lp__fah_1.cdl
+++ b/cells/fah/sky130_fd_sc_lp__fah_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_lp__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 net143 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MMIN2 COUT net143 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 SUM net87 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-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.84 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.84 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 net143 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MMIN3 SUM net87 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 SUM net87 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=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
-MI4 CIb mid1 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+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
-MI3 Bb mid2 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+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
-MI1 CIbb mid1 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+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
+MI17 Bb B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI650 CIb 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
-MI16 Bb B VPB phighvt m=1 w=1.26 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
-MI47 CIbb CIb VPB phighvt m=1 w=1.0 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
-MI45 CIb CI VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 Abb2 Ab2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 Ab2 A 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
-MI13 Abb2 Ab2 VPB phighvt m=1 w=1.26 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
-MI19 Ab1 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
-MI22 Abb2 Bb VPB phighvt m=1 w=0.84 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
-MI23 Ab1 B VPB phighvt m=1 w=0.84 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
-MI26 Abb2 B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 COUT net143 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP3 SUM net87 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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
+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
+MI13 Abb2 Ab2 VPB pfet_01v8_hvt m=1 w=1.26 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
+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_lp__fah_1
diff --git a/cells/fah/sky130_fd_sc_lp__fah_1.netlist.tsv b/cells/fah/sky130_fd_sc_lp__fah_1.netlist.tsv
index 34a48bc..1537c3f 100644
--- a/cells/fah/sky130_fd_sc_lp__fah_1.netlist.tsv
+++ b/cells/fah/sky130_fd_sc_lp__fah_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_lp__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	net143	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	net87	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	CIb	mid2	net143	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	Bb	mid1	net143	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	CIbb	mid2	net87	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	CIb	mid1	net87	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.84	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.84	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	net143	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	net87	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	CIb	mid1	net143	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	Bb	mid2	net143	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	CIbb	mid1	net87	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	CIb	mid2	net87	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.26	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.26	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	net143	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	net87	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	CIb	mid2	net143	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	Bb	mid1	net143	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	CIbb	mid2	net87	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	CIb	mid1	net87	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.84	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.84	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	net143	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	net87	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	CIb	mid1	net143	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	net143	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	net87	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	net87	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.26	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.26	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_lp__fah_1.spice b/cells/fah/sky130_fd_sc_lp__fah_1.spice
index e45a021..66cf675 100644
--- a/cells/fah/sky130_fd_sc_lp__fah_1.spice
+++ b/cells/fah/sky130_fd_sc_lp__fah_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_lp__fah_1 A B CI VGND VNB VPB VPWR COUT SUM
-M1000 VPWR a_2229_269# a_1741_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.73067e+12p pd=1.701e+07u as=7.14e+11p ps=5.65e+06u
-M1001 a_239_135# a_1022_362# a_84_21# VPB phighvt w=840000u l=150000u
-+  ad=7.6415e+11p pd=5.62e+06u as=7.047e+11p ps=3.68e+06u
-M1002 a_239_135# a_1022_362# a_413_34# VNB nshort w=640000u l=150000u
-+  ad=3.616e+11p pd=3.69e+06u as=1.792e+11p ps=1.84e+06u
-M1003 a_814_384# a_878_41# a_1741_367# VPB phighvt w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1004 VGND a_413_34# COUT VNB nshort w=840000u l=150000u
-+  ad=1.88583e+12p pd=1.312e+07u as=2.394e+11p ps=2.25e+06u
-M1005 a_1022_362# a_878_41# a_1741_367# VNB nshort w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=4.922e+11p ps=4.32e+06u
-M1006 VGND a_84_21# SUM VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.25e+06u
-M1007 VPWR a_413_34# COUT VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.591e+11p ps=3.09e+06u
-M1008 a_239_135# CI VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1741_367# B a_814_384# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1010 a_2229_269# A VGND VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1011 a_239_135# CI VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_630_100# a_239_135# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=5.4025e+11p pd=3.35e+06u as=0p ps=0u
-M1013 a_84_21# a_814_384# a_630_100# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_814_384# a_878_41# a_1930_367# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=5.175e+11p ps=4.21e+06u
-M1015 a_878_41# a_1022_362# a_413_34# VPB phighvt w=840000u l=150000u
-+  ad=4.515e+11p pd=3.31e+06u as=4.326e+11p ps=2.71e+06u
-M1016 a_2229_269# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1017 a_630_100# a_1022_362# a_84_21# VNB nshort w=640000u l=150000u
-+  ad=4.7755e+11p pd=4.2e+06u as=2.759e+11p ps=2.4e+06u
-M1018 VPWR a_84_21# SUM VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.591e+11p ps=3.09e+06u
-M1019 VGND a_2229_269# a_1741_367# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_413_34# a_814_384# a_239_135# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1930_367# B a_814_384# VPB phighvt w=840000u l=150000u
-+  ad=7.5215e+11p pd=5.67e+06u as=0p ps=0u
-M1022 VPWR B a_878_41# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_84_21# a_814_384# a_239_135# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_413_34# a_814_384# a_878_41# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=6.1475e+11p ps=5.18e+06u
-M1025 a_1930_367# B a_1022_362# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND A a_1930_367# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_630_100# a_239_135# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND B a_878_41# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1022_362# a_878_41# a_1930_367# VPB phighvt w=840000u l=150000u
-+  ad=3.024e+11p pd=2.4e+06u as=0p ps=0u
-M1030 VPWR A a_1930_367# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1741_367# B a_1022_362# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND CI a_239_135# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 a_878_41# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_239_135# a_814_384# a_84_21# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 a_84_21# a_1022_362# a_630_100# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_84_21# a_1022_362# a_239_135# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X5 a_814_384# B a_1930_367# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 COUT a_413_34# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_1930_367# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_630_100# a_814_384# a_84_21# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 a_1022_362# B a_1741_367# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 VGND A a_2229_269# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_413_34# a_1022_362# a_239_135# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_413_34# a_1022_362# a_878_41# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X13 a_1930_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X14 a_1022_362# B a_1930_367# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 a_878_41# a_814_384# a_413_34# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 VPWR a_239_135# a_630_100# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X17 a_814_384# B a_1741_367# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 SUM a_84_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_1741_367# a_2229_269# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 a_239_135# a_814_384# a_413_34# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X21 a_1741_367# a_878_41# a_1022_362# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 VPWR A a_2229_269# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X23 VPWR CI a_239_135# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X24 a_1930_367# a_878_41# a_814_384# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X25 a_1741_367# a_2229_269# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 SUM a_84_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 COUT a_413_34# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X28 a_1741_367# a_878_41# a_814_384# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X29 VGND a_239_135# a_630_100# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X30 a_1930_367# a_878_41# a_1022_362# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X31 a_878_41# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/fahcin/sky130_fd_sc_lp__fahcin_1.cdl b/cells/fahcin/sky130_fd_sc_lp__fahcin_1.cdl
index 421c430..16b0b1a 100644
--- a/cells/fahcin/sky130_fd_sc_lp__fahcin_1.cdl
+++ b/cells/fahcin/sky130_fd_sc_lp__fahcin_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_lp__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 net134 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MMIP3 SUM net134 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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 net134 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-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.84 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.84 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.84 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.26 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.26 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.26 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 net134 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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.84 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.84 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.84 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_lp__fahcin_1
diff --git a/cells/fahcin/sky130_fd_sc_lp__fahcin_1.netlist.tsv b/cells/fahcin/sky130_fd_sc_lp__fahcin_1.netlist.tsv
index 8ed08cf..56745cd 100644
--- a/cells/fahcin/sky130_fd_sc_lp__fahcin_1.netlist.tsv
+++ b/cells/fahcin/sky130_fd_sc_lp__fahcin_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_lp__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	net134	VPWR	VPB	phighvt	1	1.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	CINbb2	mid2	net134	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	CINb2	mid1	net134	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	net134	VGND	VNB	nshort	1	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	Ab	A	VGND	VNB	nshort	1	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	CINbb2	mid1	net134	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	CINb2	mid2	net134	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	net134	VPWR	VPB	pfet_01v8_hvt	1	1.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	CINbb2	mid2	net134	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	CINb2	mid1	net134	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	net134	VGND	VNB	nfet_01v8	1	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	CINbb2	mid1	net134	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	CINb2	mid2	net134	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_lp__fahcin_1.spice b/cells/fahcin/sky130_fd_sc_lp__fahcin_1.spice
index eb710fe..235940d 100644
--- a/cells/fahcin/sky130_fd_sc_lp__fahcin_1.spice
+++ b/cells/fahcin/sky130_fd_sc_lp__fahcin_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_lp__fahcin_1 A B CIN VGND VNB VPB VPWR COUT SUM
-M1000 a_364_73# B a_256_87# VNB nshort w=640000u l=150000u
-+  ad=5.5115e+11p pd=4.88e+06u as=5.216e+11p ps=4.19e+06u
-M1001 SUM a_1926_135# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=1.8946e+12p ps=1.185e+07u
-M1002 a_29_47# a_439_47# a_555_73# VPB phighvt w=840000u l=150000u
-+  ad=8.127e+11p pd=5.85e+06u as=4.69e+11p ps=2.98e+06u
-M1003 VPWR CIN a_1500_63# VPB phighvt w=1e+06u l=150000u
-+  ad=2.5664e+12p pd=1.462e+07u as=3.774e+11p ps=2.79e+06u
-M1004 VGND B a_439_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.31e+11p ps=2.23e+06u
-M1005 a_256_87# a_29_47# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_555_73# B a_29_47# VNB nshort w=640000u l=150000u
-+  ad=3.481e+11p pd=2.9e+06u as=4.186e+11p ps=4.09e+06u
-M1007 a_256_87# a_29_47# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=5.202e+11p pd=4.81e+06u as=0p ps=0u
-M1008 a_1500_63# a_555_73# COUT VNB nshort w=640000u l=150000u
-+  ad=3.456e+11p pd=2.36e+06u as=6.656e+11p ps=3.36e+06u
-M1009 a_256_87# a_439_47# a_555_73# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_555_73# B a_256_87# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND CIN a_1500_63# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A a_29_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR B a_439_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.591e+11p ps=3.09e+06u
-M1014 a_364_73# B a_29_47# VPB phighvt w=840000u l=150000u
-+  ad=4.872e+11p pd=4.52e+06u as=0p ps=0u
-M1015 a_1152_389# a_439_47# VGND VNB nshort w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1016 VGND A a_29_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_1774_367# a_1883_395# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=3.496e+11p ps=2.46e+06u
-M1018 SUM a_1926_135# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1019 a_1152_389# a_439_47# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=3.774e+11p pd=2.79e+06u as=0p ps=0u
-M1020 a_1926_135# a_555_73# a_1883_395# VPB phighvt w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=5.152e+11p ps=4.8e+06u
-M1021 a_256_87# a_439_47# a_364_73# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1774_367# CIN VGND VNB nshort w=840000u l=150000u
-+  ad=3.252e+11p pd=2.79e+06u as=0p ps=0u
-M1023 a_1774_367# CIN VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.385e+11p pd=5.99e+06u as=0p ps=0u
-M1024 a_1774_367# a_364_73# a_1926_135# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_1774_367# a_1883_395# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_29_47# a_439_47# a_364_73# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 COUT a_364_73# a_1152_389# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1883_395# a_364_73# a_1926_135# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=3.52e+11p ps=2.38e+06u
-M1029 a_1500_63# a_364_73# COUT VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=8.988e+11p ps=3.82e+06u
-M1030 COUT a_555_73# a_1152_389# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1926_135# a_555_73# a_1774_367# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1883_395# a_1774_367# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 VGND CIN a_1774_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VGND a_1926_135# SUM VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VGND a_439_47# a_1152_389# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_1152_389# a_364_73# COUT VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 VPWR a_1926_135# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND a_29_47# a_256_87# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 a_439_47# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_1883_395# a_555_73# a_1926_135# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 a_29_47# B a_364_73# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 COUT a_555_73# a_1500_63# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_256_87# B a_555_73# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X12 a_1883_395# a_1774_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 a_364_73# a_439_47# a_256_87# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 a_1926_135# a_364_73# a_1774_367# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X15 a_555_73# a_439_47# a_29_47# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 a_29_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_256_87# B a_364_73# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X18 a_1500_63# CIN VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 a_1774_367# a_555_73# a_1926_135# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X20 COUT a_364_73# a_1500_63# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X21 a_1500_63# CIN VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 a_29_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 a_1926_135# a_364_73# a_1883_395# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X24 a_439_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 a_364_73# a_439_47# a_29_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X26 a_1152_389# a_555_73# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X27 a_29_47# B a_555_73# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X28 VPWR a_29_47# a_256_87# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X29 VPWR a_439_47# a_1152_389# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X30 a_555_73# a_439_47# a_256_87# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X31 VPWR CIN a_1774_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/fahcon/sky130_fd_sc_lp__fahcon_1.cdl b/cells/fahcon/sky130_fd_sc_lp__fahcon_1.cdl
index 755f327..ed6fc19 100644
--- a/cells/fahcon/sky130_fd_sc_lp__fahcon_1.cdl
+++ b/cells/fahcon/sky130_fd_sc_lp__fahcon_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_lp__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 net186 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MMIP3 SUM net186 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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 net186 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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.26 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.26 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.84 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.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.26 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.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 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 net186 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-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.84 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.84 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.84 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_lp__fahcon_1
diff --git a/cells/fahcon/sky130_fd_sc_lp__fahcon_1.netlist.tsv b/cells/fahcon/sky130_fd_sc_lp__fahcon_1.netlist.tsv
index 34967c8..3344787 100644
--- a/cells/fahcon/sky130_fd_sc_lp__fahcon_1.netlist.tsv
+++ b/cells/fahcon/sky130_fd_sc_lp__fahcon_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_lp__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	net186	VPWR	VPB	phighvt	1	1.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb1	B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	CIb2	mid2	net186	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	CIbb2	mid1	net186	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	net186	VGND	VNB	nshort	1	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	Ab	A	VGND	VNB	nshort	1	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	CIb2	mid1	net186	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	CIbb2	mid2	net186	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	net186	VPWR	VPB	pfet_01v8_hvt	1	1.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	CIb2	mid2	net186	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	CIbb2	mid1	net186	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	net186	VGND	VNB	nfet_01v8	1	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	CIb2	mid1	net186	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	CIbb2	mid2	net186	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_lp__fahcon_1.spice b/cells/fahcon/sky130_fd_sc_lp__fahcon_1.spice
index ccec7f0..710a9a0 100644
--- a/cells/fahcon/sky130_fd_sc_lp__fahcon_1.spice
+++ b/cells/fahcon/sky130_fd_sc_lp__fahcon_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_lp__fahcon_1 A B CI VGND VNB VPB VPWR COUT_N SUM
-M1000 a_367_119# a_329_269# a_33_367# VPB phighvt w=840000u l=150000u
-+  ad=4.396e+11p pd=2.91e+06u as=5.943e+11p ps=5.33e+06u
-M1001 a_359_367# a_329_269# a_33_367# VNB nshort w=640000u l=150000u
-+  ad=3.968e+11p pd=2.52e+06u as=4.346e+11p ps=4.14e+06u
-M1002 a_1758_87# a_359_367# a_1571_367# VNB nshort w=640000u l=150000u
-+  ad=3.456e+11p pd=2.36e+06u as=3.098e+11p ps=2.47e+06u
-M1003 a_247_367# a_33_367# VGND VNB nshort w=640000u l=150000u
-+  ad=3.616e+11p pd=3.69e+06u as=1.882e+12p ps=1.182e+07u
-M1004 SUM a_1758_87# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.402e+11p pd=3.06e+06u as=2.0663e+12p ps=1.356e+07u
-M1005 a_33_367# B a_367_119# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.584e+11p ps=2.15e+06u
-M1006 a_1758_87# a_359_367# a_1708_411# VPB phighvt w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=6.877e+11p ps=5.51e+06u
-M1007 VPWR a_1571_367# a_1708_411# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_1034_380# B VGND VNB nshort w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1009 a_1340_412# a_367_119# COUT_N VNB nshort w=640000u l=150000u
-+  ad=4.358e+11p pd=2.85e+06u as=3.552e+11p ps=2.39e+06u
-M1010 COUT_N a_367_119# a_1034_380# VPB phighvt w=840000u l=150000u
-+  ad=6.804e+11p pd=3.3e+06u as=3.984e+11p ps=2.84e+06u
-M1011 VGND B a_329_269# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=3.066e+11p ps=2.41e+06u
-M1012 a_1571_367# CI VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_33_367# B a_359_367# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=4.214e+11p ps=2.76e+06u
-M1014 a_1340_412# a_359_367# COUT_N VPB phighvt w=840000u l=150000u
-+  ad=4.95275e+11p pd=3.12e+06u as=0p ps=0u
-M1015 VGND a_1571_367# a_1708_411# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=3.84e+11p ps=2.48e+06u
-M1016 VGND CI a_1340_412# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 SUM a_1758_87# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1018 a_247_367# B a_367_119# VPB phighvt w=840000u l=150000u
-+  ad=6.252e+11p pd=5.06e+06u as=0p ps=0u
-M1019 a_1708_411# a_367_119# a_1758_87# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 COUT_N a_359_367# a_1034_380# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_247_367# a_33_367# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_359_367# a_329_269# a_247_367# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1571_367# CI VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=5.985e+11p pd=5.34e+06u as=0p ps=0u
-M1024 a_1034_380# B VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A a_33_367# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR CI a_1340_412# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR B a_329_269# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1028 a_1571_367# a_367_119# a_1758_87# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_367_119# a_329_269# a_247_367# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A a_33_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_247_367# B a_359_367# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_247_367# a_329_269# a_367_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 a_33_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_1708_411# a_359_367# a_1758_87# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 a_1340_412# CI VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_359_367# B a_33_367# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X5 a_1034_380# a_367_119# COUT_N VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 a_33_367# a_329_269# a_359_367# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X7 COUT_N a_359_367# a_1340_412# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 a_1571_367# a_359_367# a_1758_87# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 VPWR CI a_1571_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VGND a_33_367# a_247_367# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 COUT_N a_367_119# a_1340_412# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_329_269# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_33_367# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_1758_87# a_367_119# a_1571_367# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X15 VPWR a_1758_87# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_33_367# a_329_269# a_367_119# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X17 a_329_269# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_1708_411# a_1571_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 VGND CI a_1571_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 VGND a_1758_87# SUM VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 a_1708_411# a_1571_367# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 VPWR a_33_367# a_247_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X23 a_359_367# B a_247_367# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X24 VGND B a_1034_380# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X25 a_1034_380# a_359_367# COUT_N VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X26 a_247_367# a_329_269# a_359_367# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X27 a_1340_412# CI VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X28 a_367_119# B a_247_367# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X29 a_1758_87# a_367_119# a_1708_411# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X30 VPWR B a_1034_380# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X31 a_367_119# B a_33_367# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/ha/sky130_fd_sc_lp__ha_0.cdl b/cells/ha/sky130_fd_sc_lp__ha_0.cdl
index d5a9f64..42c80a0 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_0.cdl
+++ b/cells/ha/sky130_fd_sc_lp__ha_0.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__ha_0 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 COUT majb VNB nfet_01v8 m=1 w=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 SUM sumb VNB nfet_01v8 m=1 w=0.42 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.42 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNs21 VGND 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
-MMNnand0 VGND 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
-MMNnand1 sndNA 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
-MMNs1 sumb majb VNB nshort m=1 w=0.42 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.42 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.42 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=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 SUM sumb 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
-MMPnand0 majb 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
-MMPnand1 majb 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
-MMPs1 VPWR majb VPB phighvt m=1 w=0.42 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=0.42 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=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 COUT majb 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
+MMIP3 SUM sumb 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
+MMPnand0 majb 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
+MMPnand1 majb 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
+MMPs1 VPWR majb VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=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_lp__ha_0
diff --git a/cells/ha/sky130_fd_sc_lp__ha_0.netlist.tsv b/cells/ha/sky130_fd_sc_lp__ha_0.netlist.tsv
index 6acb1bf..bea42e4 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_0.netlist.tsv
+++ b/cells/ha/sky130_fd_sc_lp__ha_0.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__ha_0	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A	sndNA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	majb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs1	MOSFET	sumb	majb	nint1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs20	MOSFET	VGND	A	nint1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs21	MOSFET	VGND	B	nint1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	majb	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	majb	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1	MOSFET	VPWR	majb	sumb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs20	MOSFET	VPWR	A	sndPA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs21	MOSFET	sndPA	B	sumb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	majb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	majb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1	MOSFET	sumb	majb	nint1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs20	MOSFET	VGND	A	nint1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs21	MOSFET	VGND	B	nint1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	COUT	majb	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pfet_01v8_hvt	1	0.64	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs20	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs21	MOSFET	sndPA	B	sumb	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/ha/sky130_fd_sc_lp__ha_0.spice b/cells/ha/sky130_fd_sc_lp__ha_0.spice
index 3d2ee00..b09f12c 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_0.spice
+++ b/cells/ha/sky130_fd_sc_lp__ha_0.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__ha_0 A B VGND VNB VPB VPWR COUT SUM
-M1000 VPWR a_80_60# SUM VPB phighvt w=640000u l=150000u
-+  ad=7.804e+11p pd=6.54e+06u as=1.824e+11p ps=1.85e+06u
-M1001 a_393_491# B a_80_60# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.709e+11p ps=2.13e+06u
-M1002 a_687_135# B a_204_315# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.239e+11p ps=1.43e+06u
-M1003 VGND a_80_60# SUM VNB nshort w=420000u l=150000u
-+  ad=4.2e+11p pd=4.52e+06u as=1.113e+11p ps=1.37e+06u
-M1004 VGND B a_307_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.289e+11p ps=2.77e+06u
-M1005 VPWR A a_393_491# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A a_204_315# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1007 COUT a_204_315# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1008 a_80_60# a_204_315# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 COUT a_204_315# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1010 a_204_315# B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A a_687_135# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_307_47# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_307_47# a_204_315# a_80_60# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
+X0 a_80_60# a_204_315# a_307_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_307_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_204_315# a_80_60# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VPWR a_204_315# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 a_204_315# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VPWR B a_204_315# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VGND a_204_315# COUT VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND A a_307_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_687_135# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_393_491# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_204_315# B a_687_135# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 SUM a_80_60# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_80_60# B a_393_491# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 SUM a_80_60# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/ha/sky130_fd_sc_lp__ha_1.cdl b/cells/ha/sky130_fd_sc_lp__ha_1.cdl
index 5af5218..e67a3e2 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_1.cdl
+++ b/cells/ha/sky130_fd_sc_lp__ha_1.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 COUT majb VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 SUM sumb VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnand0 VGND 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
+MMNnand1 sndNA 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
+MMNs1 sumb majb VNB nfet_01v8 m=1 w=0.42 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.42 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNs21 VGND 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
-MMNnand0 VGND 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
-MMNnand1 sndNA 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
-MMNs1 sumb majb VNB nshort m=1 w=0.42 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.42 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.42 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.26 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.26 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.42 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.42 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.42 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=0.42 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=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 COUT majb VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.42 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.42 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.42 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=0.42 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=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_lp__ha_1
diff --git a/cells/ha/sky130_fd_sc_lp__ha_1.netlist.tsv b/cells/ha/sky130_fd_sc_lp__ha_1.netlist.tsv
index 550a7da..7991389 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_1.netlist.tsv
+++ b/cells/ha/sky130_fd_sc_lp__ha_1.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A	sndNA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	majb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs1	MOSFET	sumb	majb	nint1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs20	MOSFET	VGND	A	nint1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs21	MOSFET	VGND	B	nint1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	majb	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	majb	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1	MOSFET	VPWR	majb	sumb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs20	MOSFET	VPWR	A	sndPA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs21	MOSFET	sndPA	B	sumb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	majb	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	majb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1	MOSFET	sumb	majb	nint1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs20	MOSFET	VGND	A	nint1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs21	MOSFET	VGND	B	nint1	VNB	nfet_01v8	1	0.42	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.26	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.26	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs20	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs21	MOSFET	sndPA	B	sumb	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/ha/sky130_fd_sc_lp__ha_1.spice b/cells/ha/sky130_fd_sc_lp__ha_1.spice
index 8c094a3..d185051 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_1.spice
+++ b/cells/ha/sky130_fd_sc_lp__ha_1.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__ha_1 A B VGND VNB VPB VPWR COUT SUM
-M1000 VPWR A a_223_320# VPB phighvt w=420000u l=150000u
-+  ad=1.218e+12p pd=9.56e+06u as=1.176e+11p ps=1.4e+06u
-M1001 COUT a_223_320# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1002 a_401_428# B a_80_30# VPB phighvt w=420000u l=150000u
-+  ad=1.596e+11p pd=1.6e+06u as=1.176e+11p ps=1.4e+06u
-M1003 VPWR a_80_30# SUM VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1004 a_307_62# A VGND VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=6.09e+11p ps=6.04e+06u
-M1005 VGND A a_675_146# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1006 a_223_320# B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_307_62# a_223_320# a_80_30# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1008 a_80_30# a_223_320# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_80_30# SUM VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1010 a_675_146# B a_223_320# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1011 VPWR A a_401_428# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND B a_307_62# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 COUT a_223_320# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
+X0 a_401_428# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VPWR B a_223_320# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_80_30# a_223_320# a_307_62# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_307_62# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR a_223_320# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VPWR a_223_320# a_80_30# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_223_320# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND A a_307_62# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 SUM a_80_30# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_223_320# B a_675_146# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_80_30# B a_401_428# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 SUM a_80_30# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_675_146# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VGND a_223_320# COUT VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/ha/sky130_fd_sc_lp__ha_2.cdl b/cells/ha/sky130_fd_sc_lp__ha_2.cdl
index 54a9782..7fe91df 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_2.cdl
+++ b/cells/ha/sky130_fd_sc_lp__ha_2.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 COUT majb VNB nfet_01v8 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
+MMIN3 SUM sumb VNB nfet_01v8 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
+MMNnand0 VGND 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
+MMNnand1 sndNA 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
+MMNs1 sumb majb VNB nfet_01v8 m=1 w=0.42 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.42 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNs21 VGND 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
-MMNnand0 VGND 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
-MMNnand1 sndNA 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
-MMNs1 sumb majb VNB nshort m=1 w=0.42 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.42 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.42 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.26 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.26 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.64 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.64 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.64 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=0.64 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=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=2 w=1.26 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.26 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.64 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.64 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.64 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=0.64 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=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_lp__ha_2
diff --git a/cells/ha/sky130_fd_sc_lp__ha_2.netlist.tsv b/cells/ha/sky130_fd_sc_lp__ha_2.netlist.tsv
index 4a607ee..f02f057 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_2.netlist.tsv
+++ b/cells/ha/sky130_fd_sc_lp__ha_2.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A	sndNA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	majb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs1	MOSFET	sumb	majb	nint1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs20	MOSFET	VGND	A	nint1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs21	MOSFET	VGND	B	nint1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	majb	A	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	majb	B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1	MOSFET	VPWR	majb	sumb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs20	MOSFET	VPWR	A	sndPA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs21	MOSFET	sndPA	B	sumb	VPB	phighvt	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	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	majb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1	MOSFET	sumb	majb	nint1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs20	MOSFET	VGND	A	nint1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs21	MOSFET	VGND	B	nint1	VNB	nfet_01v8	1	0.42	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.26	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.26	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.64	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.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs20	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs21	MOSFET	sndPA	B	sumb	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/ha/sky130_fd_sc_lp__ha_2.spice b/cells/ha/sky130_fd_sc_lp__ha_2.spice
index 0165d79..6547bef 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_2.spice
+++ b/cells/ha/sky130_fd_sc_lp__ha_2.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_lp__ha_2 A B VGND VNB VPB VPWR COUT SUM
-M1000 VGND a_227_397# SUM VNB nshort w=840000u l=150000u
-+  ad=9.996e+11p pd=8.71e+06u as=2.352e+11p ps=2.24e+06u
-M1001 VGND A a_492_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1002 SUM a_227_397# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=1.7551e+12p ps=1.389e+07u
-M1003 VPWR a_270_95# a_227_397# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.496e+11p ps=2.06e+06u
-M1004 a_492_131# B a_270_95# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 VGND a_270_95# COUT VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1006 a_227_397# B a_155_397# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.7e+06u
-M1007 VPWR A a_270_95# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1008 VPWR a_270_95# COUT VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1009 a_45_121# B VGND VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=0p ps=0u
-M1010 VGND A a_45_121# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_227_397# a_270_95# a_45_121# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1012 SUM a_227_397# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_155_397# A VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_270_95# B VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 COUT a_270_95# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 COUT a_270_95# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR a_227_397# SUM VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_227_397# a_270_95# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_45_121# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR A a_155_397# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 COUT a_270_95# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 COUT a_270_95# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND a_227_397# SUM VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR a_270_95# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 SUM a_227_397# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND B a_45_121# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR a_227_397# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 SUM a_227_397# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_155_397# B a_227_397# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 a_270_95# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 VPWR B a_270_95# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 a_492_131# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_45_121# a_270_95# a_227_397# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_270_95# B a_492_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND a_270_95# COUT VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/ha/sky130_fd_sc_lp__ha_4.cdl b/cells/ha/sky130_fd_sc_lp__ha_4.cdl
index 8b363aa..5602986 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_4.cdl
+++ b/cells/ha/sky130_fd_sc_lp__ha_4.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 COUT majb VNB nfet_01v8 m=4 w=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 sumb VNB nfet_01v8 m=4 w=0.84 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.84 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.84 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.84 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.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 sumb VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNs21 VGND B VNB nfet_01v8 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
-MMNnand0 VGND A VNB nshort 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
-MMNnand1 sndNA B VNB nshort 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
-MMNs1 sumb majb VNB nshort 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
-MMNs20 VGND A VNB nshort 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
-MMNs21 VGND B VNB nshort 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 COUT majb VPB phighvt m=4 w=1.26 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.26 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=1.26 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=1.26 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=1.26 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.26 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.26 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.26 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.26 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=1.26 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=1.26 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=1.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__ha_4
diff --git a/cells/ha/sky130_fd_sc_lp__ha_4.netlist.tsv b/cells/ha/sky130_fd_sc_lp__ha_4.netlist.tsv
index 3794678..a672f38 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_4.netlist.tsv
+++ b/cells/ha/sky130_fd_sc_lp__ha_4.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A	sndNA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	majb	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs1	MOSFET	sumb	majb	nint1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs20	MOSFET	VGND	A	nint1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs21	MOSFET	VGND	B	nint1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	majb	A	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	majb	B	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1	MOSFET	VPWR	majb	sumb	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs20	MOSFET	VPWR	A	sndPA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs21	MOSFET	sndPA	B	sumb	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	majb	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	majb	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1	MOSFET	sumb	majb	nint1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs20	MOSFET	VGND	A	nint1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs21	MOSFET	VGND	B	nint1	VNB	nfet_01v8	2	0.84	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	majb	A	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	majb	B	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs1	MOSFET	VPWR	majb	sumb	VPB	pfet_01v8_hvt	2	1.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/ha/sky130_fd_sc_lp__ha_4.spice b/cells/ha/sky130_fd_sc_lp__ha_4.spice
index 7f97f3a..b9cbf55 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_4.spice
+++ b/cells/ha/sky130_fd_sc_lp__ha_4.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_lp__ha_4 A B VGND VNB VPB VPWR COUT SUM
-M1000 VPWR A a_454_263# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.02805e+12p pd=2.922e+07u as=7.056e+11p ps=6.16e+06u
-M1001 a_454_263# B a_851_47# VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=5.04e+11p ps=4.56e+06u
-M1002 a_851_47# B a_454_263# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 SUM a_110_263# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1004 a_110_263# a_454_263# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.2285e+12p pd=9.51e+06u as=0p ps=0u
-M1005 a_110_263# a_454_263# a_1284_65# VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=1.0458e+12p ps=9.21e+06u
-M1006 VPWR a_454_263# COUT VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1007 VPWR B a_454_263# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_110_263# B a_1367_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1009 SUM a_110_263# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=2.3646e+12p ps=1.907e+07u
-M1010 VGND B a_1284_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1284_65# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 COUT a_454_263# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A a_1367_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_110_263# SUM VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_454_263# a_110_263# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_454_263# COUT VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1017 a_454_263# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1367_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_454_263# COUT VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_851_47# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND a_110_263# SUM VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 SUM a_110_263# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 COUT a_454_263# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND A a_1284_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_110_263# SUM VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1284_65# a_454_263# a_110_263# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_454_263# B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1367_367# B a_110_263# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1284_65# B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 COUT a_454_263# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A a_851_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR a_454_263# COUT VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 COUT a_454_263# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND a_110_263# SUM VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 SUM a_110_263# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_454_263# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_851_47# B a_454_263# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR a_110_263# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR B a_454_263# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND A a_1284_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_1284_65# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VGND a_110_263# SUM VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_1284_65# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 COUT a_454_263# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR a_454_263# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 SUM a_110_263# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VGND a_454_263# COUT VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_110_263# B a_1367_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 VPWR a_454_263# a_110_263# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_454_263# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VGND B a_1284_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 VPWR A a_454_263# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 VGND a_110_263# SUM VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_1284_65# a_454_263# a_110_263# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 SUM a_110_263# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 SUM a_110_263# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 COUT a_454_263# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 a_454_263# B a_851_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_454_263# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 COUT a_454_263# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 VGND a_454_263# COUT VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 a_1367_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 a_110_263# a_454_263# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 VGND A a_851_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 a_110_263# a_454_263# a_1284_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X30 SUM a_110_263# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 a_851_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X32 VPWR a_110_263# SUM VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X33 COUT a_454_263# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X34 a_1367_367# B a_110_263# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X35 VPWR A a_1367_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/ha/sky130_fd_sc_lp__ha_lp.cdl b/cells/ha/sky130_fd_sc_lp__ha_lp.cdl
index a6159f6..2644812 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_lp.cdl
+++ b/cells/ha/sky130_fd_sc_lp__ha_lp.cdl
@@ -16,36 +16,36 @@
 
 .SUBCKT sky130_fd_sc_lp__ha_lp 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 COUT majb VNB nfet_01v8 m=1 w=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 SUM sumb VNB nfet_01v8 m=1 w=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 net82 sumb VNB nfet_01v8 m=1 w=0.42 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.42 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNs21 VGND 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
-MI9 net82 sumb VNB nshort m=1 w=0.42 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.42 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net86 majb VNB nshort m=1 w=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 COUT majb 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
-MMIP3 SUM sumb 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
-MMPnand0 majb A 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
-MMPnand1 majb B 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
-MMPs1 VPWR majb 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
-MMPs20 VPWR A 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
-MMPs21 sndPA B 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 net86 majb VNB nfet_01v8 m=1 w=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 COUT majb 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
+MMIP3 SUM sumb 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
+MMPnand0 majb A 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
+MMPnand1 majb B 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
+MMPs1 VPWR majb 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
+MMPs20 VPWR A 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
+MMPs21 sndPA B 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_lp__ha_lp
diff --git a/cells/ha/sky130_fd_sc_lp__ha_lp.netlist.tsv b/cells/ha/sky130_fd_sc_lp__ha_lp.netlist.tsv
index 04b165e..d4069cd 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_lp.netlist.tsv
+++ b/cells/ha/sky130_fd_sc_lp__ha_lp.netlist.tsv
@@ -1,18 +1,18 @@
 sky130_fd_sc_lp__ha_lp	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	net86	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	net82	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net82	sumb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A	sndNA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	majb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs1	MOSFET	sumb	majb	nint1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs20	MOSFET	VGND	A	nint1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs21	MOSFET	VGND	B	nint1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net86	majb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	majb	A	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	majb	B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1	MOSFET	VPWR	majb	sumb	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs20	MOSFET	VPWR	A	sndPA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs21	MOSFET	sndPA	B	sumb	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	majb	net86	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	net82	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net82	sumb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	majb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1	MOSFET	sumb	majb	nint1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs20	MOSFET	VGND	A	nint1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs21	MOSFET	VGND	B	nint1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net86	majb	VGND	VNB	nfet_01v8	1	0.42	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	majb	A	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	majb	B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs1	MOSFET	VPWR	majb	sumb	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs20	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs21	MOSFET	sndPA	B	sumb	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/ha/sky130_fd_sc_lp__ha_lp.spice b/cells/ha/sky130_fd_sc_lp__ha_lp.spice
index 84f692a..329b8e1 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_lp.spice
+++ b/cells/ha/sky130_fd_sc_lp__ha_lp.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__ha_lp A B VGND VNB VPB VPWR COUT SUM
-M1000 a_296_286# B VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.8e+11p pd=2.56e+06u as=9.85e+11p ps=7.97e+06u
-M1001 VGND A a_743_125# VNB nshort w=420000u l=150000u
-+  ad=3.5385e+11p pd=4.21e+06u as=8.82e+10p ps=1.26e+06u
-M1002 a_901_125# a_296_286# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1003 a_743_125# B a_296_286# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1004 VPWR a_83_153# SUM VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1005 a_369_47# a_296_286# a_83_153# VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=1.1865e+11p ps=1.41e+06u
-M1006 VGND a_83_153# a_113_179# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1007 VPWR A a_493_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=3.2e+11p ps=2.64e+06u
-M1008 a_113_179# a_83_153# SUM VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1009 VGND B a_369_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_493_419# B a_83_153# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=4.85e+11p ps=2.97e+06u
-M1011 VPWR A a_296_286# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 COUT a_296_286# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1013 a_83_153# a_296_286# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 COUT a_296_286# a_901_125# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1015 a_369_47# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_296_286# B a_743_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR a_296_286# a_83_153# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 VPWR B a_296_286# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_743_125# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_901_125# a_296_286# COUT VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_83_153# B a_493_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 SUM a_83_153# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 VGND a_296_286# a_901_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_296_286# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_113_179# a_83_153# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_83_153# a_296_286# a_369_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_493_419# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 a_369_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 SUM a_83_153# a_113_179# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VGND A a_369_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_296_286# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/ha/sky130_fd_sc_lp__ha_m.cdl b/cells/ha/sky130_fd_sc_lp__ha_m.cdl
index 162a7fe..38e4849 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_m.cdl
+++ b/cells/ha/sky130_fd_sc_lp__ha_m.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__ha_m 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 COUT majb VNB nfet_01v8 m=1 w=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 SUM sumb VNB nfet_01v8 m=1 w=0.42 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.42 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNs21 VGND 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
-MMNnand0 VGND 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
-MMNnand1 sndNA 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
-MMNs1 sumb majb VNB nshort m=1 w=0.42 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.42 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.42 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=0.42 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=0.42 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.42 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.42 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.42 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=0.42 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=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 COUT majb VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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.42 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.42 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.42 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=0.42 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=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_lp__ha_m
diff --git a/cells/ha/sky130_fd_sc_lp__ha_m.netlist.tsv b/cells/ha/sky130_fd_sc_lp__ha_m.netlist.tsv
index 22ade8d..3473323 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_m.netlist.tsv
+++ b/cells/ha/sky130_fd_sc_lp__ha_m.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__ha_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	SUM	sumb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A	sndNA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	majb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs1	MOSFET	sumb	majb	nint1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs20	MOSFET	VGND	A	nint1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNs21	MOSFET	VGND	B	nint1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	COUT	majb	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	SUM	sumb	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	majb	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	majb	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs1	MOSFET	VPWR	majb	sumb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs20	MOSFET	VPWR	A	sndPA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPs21	MOSFET	sndPA	B	sumb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	COUT	majb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	SUM	sumb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	majb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs1	MOSFET	sumb	majb	nint1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs20	MOSFET	VGND	A	nint1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNs21	MOSFET	VGND	B	nint1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	COUT	majb	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	SUM	sumb	VPWR	VPB	pfet_01v8_hvt	1	0.42	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs20	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPs21	MOSFET	sndPA	B	sumb	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/ha/sky130_fd_sc_lp__ha_m.spice b/cells/ha/sky130_fd_sc_lp__ha_m.spice
index 045cab5..d61552a 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_m.spice
+++ b/cells/ha/sky130_fd_sc_lp__ha_m.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__ha_m A B VGND VNB VPB VPWR COUT SUM
-M1000 VGND A a_720_125# VNB nshort w=420000u l=150000u
-+  ad=4.224e+11p pd=4.55e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VGND a_80_60# SUM VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1002 VPWR a_80_60# SUM VPB phighvt w=420000u l=150000u
-+  ad=5.8235e+11p pd=5.54e+06u as=1.113e+11p ps=1.37e+06u
-M1003 a_80_60# a_249_212# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1004 COUT a_249_212# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1005 a_720_125# B a_249_212# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.512e+11p ps=1.56e+06u
-M1006 VGND B a_301_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.289e+11p ps=2.77e+06u
-M1007 a_301_47# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A a_249_212# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.974e+11p ps=1.78e+06u
-M1009 VPWR A a_450_464# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1010 COUT a_249_212# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1011 a_301_47# a_249_212# a_80_60# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1012 a_450_464# B a_80_60# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_249_212# B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_249_212# a_80_60# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VPWR B a_249_212# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_301_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 SUM a_80_60# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VPWR a_249_212# COUT VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_80_60# B a_450_464# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_249_212# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND a_249_212# COUT VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_720_125# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 SUM a_80_60# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_80_60# a_249_212# a_301_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_249_212# B a_720_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_450_464# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 VGND A a_301_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.cdl b/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.cdl
index d0a2da1..ad97e78 100644
--- a/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.cdl
+++ b/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__inputiso0n_lp A SLEEP_B VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP_B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MI14 X net52 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI14 X net52 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 net52 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 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
-MI13 sndA SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI13 sndA SLEEP_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
-MI20 net36 net52 VNB nshort m=1 w=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 net55 SLEEP_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI20 net36 net52 VNB nfet_01v8 m=1 w=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 net59 net52 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MMP1 net55 SLEEP_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
-MI11 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
-MI19 X net52 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net52 SLEEP_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI12 net59 net52 VPB pfet_01v8_hvt m=1 w=1.26 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
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 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
+MI19 X net52 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net52 SLEEP_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
+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_lp__inputiso0n_lp
diff --git a/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.netlist.tsv b/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.netlist.tsv
index befa79d..ad1d651 100644
--- a/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.netlist.tsv
+++ b/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__inputiso0n_lp	A:I SLEEP_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
-MI14	MOSFET	X	net52	net36	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	net52	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	sndA	SLEEP_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net36	net52	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	net55	SLEEP_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net59	net52	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net51	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	X	net52	net59	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net52	SLEEP_B	net55	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	net52	A	net51	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	X	net52	net36	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	net52	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	sndA	SLEEP_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net36	net52	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	net55	SLEEP_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net59	net52	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	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
+MI19	MOSFET	X	net52	net59	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net52	SLEEP_B	net55	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	net52	A	net51	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/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.spice b/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.spice
index 1ed3d1e..5a29f1e 100644
--- a/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.spice
+++ b/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__inputiso0n_lp A SLEEP_B VGND VNB VPB VPWR X
-M1000 a_307_489# SLEEP_B a_138_93# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1001 VPWR SLEEP_B a_307_489# VPB phighvt w=420000u l=150000u
-+  ad=5.103e+11p pd=4.73e+06u as=0p ps=0u
-M1002 a_493_93# a_138_93# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.57e+11p ps=2.54e+06u
-M1003 a_493_367# a_138_93# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1004 X a_138_93# a_493_93# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1005 a_138_93# A a_149_489# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1006 X a_138_93# a_493_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1007 a_221_93# A a_138_93# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1008 VGND SLEEP_B a_221_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_149_489# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_221_93# SLEEP_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_493_93# a_138_93# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_138_93# SLEEP_B a_307_489# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_149_489# A a_138_93# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_307_489# SLEEP_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_138_93# A a_221_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_138_93# a_493_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR A a_149_489# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VPWR a_138_93# a_493_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_493_367# a_138_93# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.cdl b/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.cdl
index 3ab7a50..53d3475 100644
--- a/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.cdl
+++ b/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__inputiso0p_lp A SLEEP VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP:I VGND:I VNB:I VPB:I VPWR:I X:O
-MI9 X y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI8 net41 A VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 X y VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 sleepb SLEEP VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI8 net41 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
-MI7 net45 sleepb VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMIP0 sleepb SLEEP VPB pfet_01v8_hvt m=1 w=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 net69 y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 net61 SLEEP VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI7 net45 sleepb VPB pfet_01v8_hvt m=1 w=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 y sleepb VPB phighvt m=1 w=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 y 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
-MMIN0 sleepb SLEEP VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI20 net69 y VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 y 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
-MI21 net86 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI19 net61 SLEEP VPB pfet_01v8_hvt m=1 w=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 y sleepb VPB pfet_01v8_hvt m=1 w=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 y 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
-MI18 net82 SLEEP VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 sleepb SLEEP VNB nfet_01v8 m=1 w=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 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
-MI12 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI11 sndA sleepb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI21 net86 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net82 SLEEP VNB nfet_01v8 m=1 w=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 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 sndA sleepb VNB nfet_01v8 m=1 w=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_lp__inputiso0p_lp
diff --git a/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.netlist.tsv b/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.netlist.tsv
index 76c08cb..fbd485b 100644
--- a/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.netlist.tsv
+++ b/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__inputiso0p_lp	A:I SLEEP: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
-MI9	MOSFET	X	y	net69	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net41	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	sleepb	SLEEP	net61	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net45	sleepb	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net69	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	net61	SLEEP	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	y	sleepb	net45	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	y	A	net41	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	sleepb	SLEEP	net82	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net86	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net82	SLEEP	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	X	y	net86	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	sndA	sleepb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	X	y	net69	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net41	A	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	sleepb	SLEEP	net61	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net45	sleepb	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net69	y	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	net61	SLEEP	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	y	sleepb	net45	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	y	A	net41	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	sleepb	SLEEP	net82	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net86	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net82	SLEEP	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	X	y	net86	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	sndA	sleepb	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/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.spice b/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.spice
index 0eb790c..d4d7e40 100644
--- a/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.spice
+++ b/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__inputiso0p_lp A SLEEP VGND VNB VPB VPWR X
-M1000 a_432_489# A a_342_489# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.26e+11p ps=1.44e+06u
-M1001 a_342_489# A a_340_93# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1002 VPWR SLEEP a_112_489# VPB phighvt w=420000u l=150000u
-+  ad=4.83e+11p pd=4.6e+06u as=8.82e+10p ps=1.26e+06u
-M1003 a_602_93# a_342_489# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.759e+11p ps=3.47e+06u
-M1004 X a_342_489# a_602_93# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1005 a_112_489# SLEEP a_27_93# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1006 VGND SLEEP a_112_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1007 a_340_93# a_27_93# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_602_367# a_342_489# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1009 X a_342_489# a_602_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1010 VPWR A a_432_489# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_270_489# a_27_93# VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1012 a_112_93# SLEEP a_27_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1013 a_342_489# a_27_93# a_270_489# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_342_489# A a_432_489# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VGND a_342_489# a_602_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_112_93# SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_27_93# SLEEP a_112_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_112_489# SLEEP VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_27_93# SLEEP a_112_489# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VGND a_27_93# a_340_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_342_489# a_602_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_602_367# a_342_489# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_432_489# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_340_93# A a_342_489# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR a_27_93# a_270_489# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 a_270_489# a_27_93# a_342_489# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 a_602_93# a_342_489# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.cdl b/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.cdl
index 66124e9..99476a9 100644
--- a/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.cdl
+++ b/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__inputiso1n_lp A SLEEP_B VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP_B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MI23 VPWR sleep VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net57 net73 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 VPWR net73 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 sleep SLEEP_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI23 VPWR sleep VPB pfet_01v8_hvt m=1 w=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 sndPA 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
-MI21 net48 SLEEP_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI8 net57 net73 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 sleep SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI24 VPWR net73 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net89 net73 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 sleep SLEEP_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
+MI7 sndPA 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
+MI21 net48 SLEEP_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
+MMIN0 sleep SLEEP_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
+MI27 net89 net73 VNB nfet_01v8 m=1 w=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 net85 sleep VNB nfet_01v8 m=1 w=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 net73 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
-MI26 net85 sleep VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X net73 VNB nfet_01v8 m=1 w=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 net73 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 net73 sleep VNB nfet_01v8 m=1 w=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 net69 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X net73 VNB nshort m=1 w=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 net73 sleep VNB nshort m=1 w=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 net69 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
-MI22 net65 SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI22 net65 SLEEP_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
 .ENDS sky130_fd_sc_lp__inputiso1n_lp
diff --git a/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.netlist.tsv b/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.netlist.tsv
index a2c5412..4b67777 100644
--- a/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.netlist.tsv
+++ b/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__inputiso1n_lp	A:I SLEEP_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
-MI23	MOSFET	VPWR	sleep	sndPA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net57	net73	X	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	VPWR	net73	net57	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	sleep	SLEEP_B	net48	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	sndPA	A	net73	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net48	SLEEP_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	sleep	SLEEP_B	net65	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net89	net73	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net85	sleep	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net73	A	net69	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	net73	net89	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net73	sleep	net85	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net69	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net65	SLEEP_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	VPWR	sleep	sndPA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net57	net73	X	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	VPWR	net73	net57	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	sleep	SLEEP_B	net48	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	sndPA	A	net73	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net48	SLEEP_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	sleep	SLEEP_B	net65	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net89	net73	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net85	sleep	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net73	A	net69	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	net73	net89	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net73	sleep	net85	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net69	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net65	SLEEP_B	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/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.spice b/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.spice
index 9a6ef20..dbfb3b1 100644
--- a/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.spice
+++ b/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__inputiso1n_lp A SLEEP_B VGND VNB VPB VPWR X
-M1000 a_340_489# a_27_93# VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=4.977e+11p ps=4.67e+06u
-M1001 VGND SLEEP_B a_110_93# VNB nshort w=420000u l=150000u
-+  ad=2.478e+11p pd=2.86e+06u as=8.82e+10p ps=1.26e+06u
-M1002 a_438_93# A a_340_93# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.428e+11p ps=1.52e+06u
-M1003 a_602_93# a_340_93# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 a_154_489# SLEEP_B a_27_93# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.113e+11p ps=1.37e+06u
-M1005 X a_340_93# a_602_93# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 a_110_93# SLEEP_B a_27_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 a_340_93# a_27_93# a_268_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1008 a_602_367# a_340_93# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1009 VPWR SLEEP_B a_154_489# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_340_93# a_602_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1011 a_268_93# a_27_93# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A a_438_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_340_93# A a_340_489# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 a_27_93# SLEEP_B a_110_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_438_93# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_340_93# A a_438_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_27_93# SLEEP_B a_154_489# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_340_489# A a_340_93# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VGND a_27_93# a_268_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_340_93# a_602_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_268_93# a_27_93# a_340_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_27_93# a_340_489# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VPWR a_340_93# a_602_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_602_367# a_340_93# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_154_489# SLEEP_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 a_602_93# a_340_93# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_110_93# SLEEP_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.cdl b/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.cdl
index 5648602..332e1c6 100644
--- a/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.cdl
+++ b/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__inputiso1p_lp A SLEEP VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR SLEEP VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR SLEEP VPB pfet_01v8_hvt m=1 w=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 sndPA 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
+MI8 net34 net62 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 VPWR net62 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net66 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
-MI7 sndPA A VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 net62 SLEEP VNB nfet_01v8 m=1 w=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 net62 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net34 net62 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MI17 net62 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
-MI15 VPWR net62 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net66 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 net62 SLEEP VNB nshort m=1 w=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 net62 VNB nshort m=1 w=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 net62 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 net50 SLEEP VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 net46 net62 VNB nshort m=1 w=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 net50 SLEEP VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 net46 net62 VNB nfet_01v8 m=1 w=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_lp__inputiso1p_lp
diff --git a/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.netlist.tsv b/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.netlist.tsv
index 5a049b8..1c9b9d5 100644
--- a/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.netlist.tsv
+++ b/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__inputiso1p_lp	A:I SLEEP: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	SLEEP	sndPA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	sndPA	A	net62	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net34	net62	X	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	VPWR	net62	net34	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net66	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net62	SLEEP	net50	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	net62	net46	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	net62	A	net66	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net50	SLEEP	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	net46	net62	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	SLEEP	sndPA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	sndPA	A	net62	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net34	net62	X	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	VPWR	net62	net34	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net66	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net62	SLEEP	net50	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	net62	net46	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	net62	A	net66	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net50	SLEEP	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	net46	net62	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/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.spice b/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.spice
index 8588159..e71da5b 100644
--- a/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.spice
+++ b/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__inputiso1p_lp A SLEEP VGND VNB VPB VPWR X
-M1000 VPWR SLEEP a_245_489# VPB phighvt w=420000u l=150000u
-+  ad=5.292e+11p pd=3.98e+06u as=8.82e+10p ps=1.26e+06u
-M1001 a_335_93# SLEEP a_161_489# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1002 a_493_93# a_161_489# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.289e+11p ps=2.77e+06u
-M1003 a_493_367# a_161_489# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1004 X a_161_489# a_493_93# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1005 a_245_489# A a_161_489# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1006 X a_161_489# a_493_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1007 a_177_93# A VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1008 a_161_489# A a_177_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND SLEEP a_335_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_493_93# a_161_489# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_245_489# SLEEP VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_177_93# A a_161_489# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_161_489# SLEEP a_335_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_335_93# SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_161_489# a_493_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND A a_177_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_161_489# A a_245_489# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VPWR a_161_489# a_493_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_493_367# a_161_489# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.cdl b/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.cdl
index 41729a7..2b9604f 100644
--- a/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.cdl
+++ b/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_lp__inputisolatch_lp D SLEEP_B VGND VNB VPB VPWR Q
 *.PININFO D:I SLEEP_B:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI673 net81 net46 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI673 net81 net46 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI677 Q s0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI677 Q 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
-MI636 sleepneg sleeppos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 sleepneg sleeppos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI674 net46 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
-MI674 net46 s0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI19 s0 sleepneg VNB nfet_01v8 m=1 w=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 net61 D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 s0 sleepneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 net68 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 s0 sleeppos VNB nfet_01v8 m=1 w=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 net49 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
+MI654 net80 net46 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI671 net41 SLEEP_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
+MI670 sleeppos SLEEP_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
+MI643 sleeppos SLEEP_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
+MI635 sleepneg sleeppos 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
+MI662 net105 net46 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
+MI664 s0 sleepneg 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
+MI658 net46 s0 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
+MI663 Q s0 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
-MI20 net61 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 net68 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 s0 sleeppos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI17 s0 sleeppos VPB pfet_01v8_hvt m=1 w=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 net49 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
-MI654 net80 net46 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI18 net88 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
-MI671 net41 SLEEP_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
-MI670 sleeppos SLEEP_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
-MI643 sleeppos SLEEP_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
-MI635 sleepneg sleeppos VPB phighvt 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
-MI662 net105 net46 VPB phighvt 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
-MI664 s0 sleepneg VPB phighvt 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
-MI658 net46 s0 VPB phighvt 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
-MI663 Q s0 VPB phighvt 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
-MI17 s0 sleeppos VPB phighvt m=1 w=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 net88 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
 .ENDS sky130_fd_sc_lp__inputisolatch_lp
diff --git a/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.netlist.tsv b/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.netlist.tsv
index e6d0921..3430e8c 100644
--- a/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.netlist.tsv
+++ b/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_lp__inputisolatch_lp	D:I SLEEP_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
-MI673	MOSFET	net81	net46	net80	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	Q	s0	net49	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	sleepneg	sleeppos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI674	MOSFET	net46	s0	net68	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	s0	sleepneg	net61	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net61	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net68	s0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	sleeppos	net81	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net49	s0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net80	net46	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI671	MOSFET	net41	SLEEP_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	sleeppos	SLEEP_B	net41	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	sleeppos	SLEEP_B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	sleepneg	sleeppos	VPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net105	net46	VPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	sleepneg	net105	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net46	s0	VPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	Q	s0	VPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	s0	sleeppos	net88	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net88	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI673	MOSFET	net81	net46	net80	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	Q	s0	net49	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	sleepneg	sleeppos	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI674	MOSFET	net46	s0	net68	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	s0	sleepneg	net61	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net61	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net68	s0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	sleeppos	net81	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net49	s0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net80	net46	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI671	MOSFET	net41	SLEEP_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	sleeppos	SLEEP_B	net41	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	sleeppos	SLEEP_B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	sleepneg	sleeppos	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net105	net46	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	sleepneg	net105	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net46	s0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	Q	s0	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	s0	sleeppos	net88	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net88	D	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/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.spice b/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.spice
index 9e0857d..963ba63 100644
--- a/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.spice
+++ b/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__inputisolatch_lp D SLEEP_B VGND VNB VPB VPWR Q
-M1000 VGND a_458_293# a_521_73# VNB nshort w=420000u l=150000u
-+  ad=5.95e+11p pd=6.54e+06u as=1.008e+11p ps=1.32e+06u
-M1001 a_117_535# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.814e+11p pd=2.18e+06u as=9.997e+11p ps=8.81e+06u
-M1002 a_837_93# SLEEP_B a_21_179# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1003 VPWR a_458_293# a_410_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1004 Q a_281_535# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=3.4e+11p pd=2.68e+06u as=0p ps=0u
-M1005 Q a_281_535# a_1284_177# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1006 VPWR SLEEP_B a_21_179# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.56e+11p ps=2.08e+06u
-M1007 a_458_293# a_281_535# a_1009_93# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1008 a_281_535# a_36_73# a_232_125# VNB nshort w=420000u l=150000u
-+  ad=2.023e+11p pd=2.15e+06u as=1.008e+11p ps=1.32e+06u
-M1009 a_1284_177# a_281_535# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_232_125# D VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_410_419# a_36_73# a_281_535# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=3.312e+11p ps=2.79e+06u
-M1012 VPWR a_281_535# a_458_293# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1013 a_419_73# a_21_179# a_281_535# VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1014 a_36_73# a_21_179# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1015 a_521_73# a_458_293# a_419_73# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1009_93# a_281_535# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND SLEEP_B a_837_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_21_179# a_36_73# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1019 a_281_535# a_21_179# a_117_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_419_73# a_458_293# a_521_73# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_21_179# SLEEP_B a_837_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_281_535# a_21_179# a_419_73# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_117_535# a_21_179# a_281_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_837_93# SLEEP_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_232_125# a_36_73# a_281_535# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_281_535# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_36_73# a_21_179# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR D a_117_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VPWR a_21_179# a_36_73# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 VGND D a_232_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_458_293# a_281_535# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 a_21_179# SLEEP_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 a_410_419# a_458_293# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X14 a_1284_177# a_281_535# Q VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_281_535# a_36_73# a_410_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X16 a_1009_93# a_281_535# a_458_293# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND a_281_535# a_1284_177# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_521_73# a_458_293# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VGND a_281_535# a_1009_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_lp__inv_0.cdl b/cells/inv/sky130_fd_sc_lp__inv_0.cdl
index b845690..4cae946 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_0.cdl
+++ b/cells/inv/sky130_fd_sc_lp__inv_0.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__inv_0 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A 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
-MMIN1 Y A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 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
 .ENDS sky130_fd_sc_lp__inv_0
diff --git a/cells/inv/sky130_fd_sc_lp__inv_0.netlist.tsv b/cells/inv/sky130_fd_sc_lp__inv_0.netlist.tsv
index be98124..e10c9b1 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_0.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_lp__inv_0.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__inv_0	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	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/inv/sky130_fd_sc_lp__inv_0.spice b/cells/inv/sky130_fd_sc_lp__inv_0.spice
index 53b205c..b55f19a 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_0.spice
+++ b/cells/inv/sky130_fd_sc_lp__inv_0.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_lp__inv_0 A VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.113e+11p ps=1.37e+06u
-M1001 Y A VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=1.696e+11p ps=1.81e+06u
+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=640000u l=150000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_lp__inv_1.cdl b/cells/inv/sky130_fd_sc_lp__inv_1.cdl
index 4af3918..609bb3e 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_1.cdl
+++ b/cells/inv/sky130_fd_sc_lp__inv_1.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__inv_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Y A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Y A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__inv_1
diff --git a/cells/inv/sky130_fd_sc_lp__inv_1.netlist.tsv b/cells/inv/sky130_fd_sc_lp__inv_1.netlist.tsv
index 9d4f33c..54264e1 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_1.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_lp__inv_1.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__inv_1	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	VGND	VNB	nshort	1	0.84	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_lp__inv_1.spice b/cells/inv/sky130_fd_sc_lp__inv_1.spice
index edbb4cf..3258868 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_1.spice
+++ b/cells/inv/sky130_fd_sc_lp__inv_1.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_lp__inv_1 A VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=2.226e+11p ps=2.21e+06u
-M1001 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=3.339e+11p ps=3.05e+06u
+X0 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_lp__inv_16.cdl b/cells/inv/sky130_fd_sc_lp__inv_16.cdl
index 45a2487..3635d01 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_16.cdl
+++ b/cells/inv/sky130_fd_sc_lp__inv_16.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__inv_16 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB phighvt m=16 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Y A VNB nshort m=16 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB pfet_01v8_hvt m=16 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Y A VNB nfet_01v8 m=16 w=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_lp__inv_16
diff --git a/cells/inv/sky130_fd_sc_lp__inv_16.netlist.tsv b/cells/inv/sky130_fd_sc_lp__inv_16.netlist.tsv
index 056a374..d904973 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_16.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_lp__inv_16.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__inv_16	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	VPWR	VPB	phighvt	16	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	VGND	VNB	nshort	16	0.84	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_01v8	16	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_lp__inv_16.spice b/cells/inv/sky130_fd_sc_lp__inv_16.spice
index 705a47d..db2fb18 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_16.spice
+++ b/cells/inv/sky130_fd_sc_lp__inv_16.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_lp__inv_16 A VGND VNB VPB Y
-M1000 Y A VPB w_n38_331# phighvt w=1.26e+06u l=150000u
-+  ad=2.8224e+12p pd=2.464e+07u as=3.1626e+12p ps=2.77e+07u
-M1001 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=2.0916e+12p pd=2.01e+07u as=1.8816e+12p ps=1.792e+07u
-M1002 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPB A Y w_n38_331# phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VPB w_n38_331# phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VPB w_n38_331# phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPB A Y w_n38_331# phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A VPB w_n38_331# phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPB A Y w_n38_331# phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A VPB w_n38_331# phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A VPB w_n38_331# phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPB A Y w_n38_331# phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPB A Y w_n38_331# phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPB A Y w_n38_331# phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPB A Y w_n38_331# phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y A VPB w_n38_331# phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y A VPB w_n38_331# phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPB A Y w_n38_331# phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VPB w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPB A Y w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 Y A VPB w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 Y A VPB w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPB A Y w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VPB A Y w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VPB A Y w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 Y A VPB w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VPB A Y w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 Y A VPB w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 VPB A Y w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 Y A VPB w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 Y A VPB w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 VPB A Y w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X30 Y A VPB w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 VPB A Y w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_lp__inv_2.cdl b/cells/inv/sky130_fd_sc_lp__inv_2.cdl
index b31f864..95250cf 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_2.cdl
+++ b/cells/inv/sky130_fd_sc_lp__inv_2.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__inv_2 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Y A VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Y A VNB nfet_01v8 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_lp__inv_2
diff --git a/cells/inv/sky130_fd_sc_lp__inv_2.netlist.tsv b/cells/inv/sky130_fd_sc_lp__inv_2.netlist.tsv
index 3cceddb..1d3d5ee 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_2.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_lp__inv_2.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__inv_2	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	VGND	VNB	nshort	2	0.84	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_lp__inv_2.spice b/cells/inv/sky130_fd_sc_lp__inv_2.spice
index 689fde0..8defe72 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_2.spice
+++ b/cells/inv/sky130_fd_sc_lp__inv_2.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__inv_2 A VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=4.452e+11p ps=4.42e+06u
-M1001 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.678e+11p pd=6.1e+06u as=3.528e+11p ps=3.08e+06u
-M1002 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_lp__inv_4.cdl b/cells/inv/sky130_fd_sc_lp__inv_4.cdl
index c21748d..57df9cf 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_4.cdl
+++ b/cells/inv/sky130_fd_sc_lp__inv_4.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__inv_4 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB pfet_01v8_hvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Y A VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Y A VNB nfet_01v8 m=4 w=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_lp__inv_4
diff --git a/cells/inv/sky130_fd_sc_lp__inv_4.netlist.tsv b/cells/inv/sky130_fd_sc_lp__inv_4.netlist.tsv
index 8e76f56..1e8ab05 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_4.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_lp__inv_4.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__inv_4	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	VGND	VNB	nshort	4	0.84	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_lp__inv_4.spice b/cells/inv/sky130_fd_sc_lp__inv_4.spice
index 488333c..66e7bf5 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_4.spice
+++ b/cells/inv/sky130_fd_sc_lp__inv_4.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__inv_4 A VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=6.804e+11p ps=6.66e+06u
-M1001 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0206e+12p pd=9.18e+06u as=7.056e+11p ps=6.16e+06u
-M1004 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_lp__inv_8.cdl b/cells/inv/sky130_fd_sc_lp__inv_8.cdl
index 8281e0a..ee7de1a 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_8.cdl
+++ b/cells/inv/sky130_fd_sc_lp__inv_8.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__inv_8 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB phighvt m=8 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB pfet_01v8_hvt m=8 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Y A VNB nshort m=8 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Y A VNB nfet_01v8 m=8 w=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_lp__inv_8
diff --git a/cells/inv/sky130_fd_sc_lp__inv_8.netlist.tsv b/cells/inv/sky130_fd_sc_lp__inv_8.netlist.tsv
index 3c54960..807f3c1 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_8.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_lp__inv_8.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__inv_8	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	VPWR	VPB	phighvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	VGND	VNB	nshort	8	0.84	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	VGND	VNB	nfet_01v8	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/inv/sky130_fd_sc_lp__inv_8.spice b/cells/inv/sky130_fd_sc_lp__inv_8.spice
index 6953500..dbe370f 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_8.spice
+++ b/cells/inv/sky130_fd_sc_lp__inv_8.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__inv_8 A VGND VNB VPB VPWR Y
-M1000 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7766e+12p pd=1.542e+07u as=1.4112e+12p ps=1.232e+07u
-M1001 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=1.1844e+12p pd=1.122e+07u as=9.408e+11p ps=8.96e+06u
-M1002 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_lp__inv_lp.cdl b/cells/inv/sky130_fd_sc_lp__inv_lp.cdl
index 41e207c..b25d643 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_lp.cdl
+++ b/cells/inv/sky130_fd_sc_lp__inv_lp.cdl
@@ -16,10 +16,10 @@
 
 .SUBCKT sky130_fd_sc_lp__inv_lp A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A 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
-MMIN1 Y A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A 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
-MI5 net28 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 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
+MI5 net28 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__inv_lp
diff --git a/cells/inv/sky130_fd_sc_lp__inv_lp.netlist.tsv b/cells/inv/sky130_fd_sc_lp__inv_lp.netlist.tsv
index dbd880f..cc7174c 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_lp.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_lp__inv_lp.netlist.tsv
@@ -1,5 +1,5 @@
 sky130_fd_sc_lp__inv_lp	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	net28	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net28	A	VGND	VNB	nshort	1	0.42	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	net28	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net28	A	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/inv/sky130_fd_sc_lp__inv_lp.spice b/cells/inv/sky130_fd_sc_lp__inv_lp.spice
index f70d5ce..18d60e2 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_lp.spice
+++ b/cells/inv/sky130_fd_sc_lp__inv_lp.spice
@@ -16,10 +16,7 @@
 
 
 .subckt sky130_fd_sc_lp__inv_lp A VGND VNB VPB VPWR Y
-M1000 a_124_67# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1001 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=2.85e+11p ps=2.57e+06u
-M1002 Y A a_124_67# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
+X0 a_124_67# A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND A a_124_67# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/inv/sky130_fd_sc_lp__inv_m.cdl b/cells/inv/sky130_fd_sc_lp__inv_m.cdl
index 253aa09..8cc0803 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_m.cdl
+++ b/cells/inv/sky130_fd_sc_lp__inv_m.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__inv_m A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Y 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
-MMIN1 Y A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 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
 .ENDS sky130_fd_sc_lp__inv_m
diff --git a/cells/inv/sky130_fd_sc_lp__inv_m.netlist.tsv b/cells/inv/sky130_fd_sc_lp__inv_m.netlist.tsv
index 10f57aa..479664d 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_m.netlist.tsv
+++ b/cells/inv/sky130_fd_sc_lp__inv_m.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__inv_m	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	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/inv/sky130_fd_sc_lp__inv_m.spice b/cells/inv/sky130_fd_sc_lp__inv_m.spice
index b1f6197..153b07d 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_m.spice
+++ b/cells/inv/sky130_fd_sc_lp__inv_m.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_lp__inv_m A VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.113e+11p ps=1.37e+06u
-M1001 Y A VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.113e+11p ps=1.37e+06u
+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=420000u l=150000u
 .ends
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.cdl b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.cdl
index 358e414..ed6315e 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.cdl
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__invkapwr_1 A KAPWR VGND VNB VPB VPWR Y
 *.PININFO A:I KAPWR:I VGND:I VNB:I VPB:I VPWR:I Y:O
-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
-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
 .ENDS sky130_fd_sc_lp__invkapwr_1
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.netlist.tsv b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.netlist.tsv
index 948c9b7..5af0ed9 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.netlist.tsv
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__invkapwr_1	A:I KAPWR: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
-MMIP0	MOSFET	Y	A	KAPWR	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	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	Y	A	KAPWR	VPB	pfet_01v8_hvt	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
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.spice b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.spice
index cd79497..1a65593 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.spice
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.spice
@@ -16,10 +16,7 @@
 
 
 .subckt sky130_fd_sc_lp__invkapwr_1 A KAPWR VGND VNB VPB VPWR Y
-M1000 KAPWR A Y VPB phighvt w=840000u l=150000u
-+  ad=4.452e+11p pd=4.42e+06u as=2.352e+11p ps=2.24e+06u
-M1001 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.113e+11p ps=1.37e+06u
-M1002 Y A KAPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 KAPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.cdl b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.cdl
index 4e2aad7..03a894c 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.cdl
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__invkapwr_2 A KAPWR VGND VNB VPB VPWR Y
 *.PININFO A:I KAPWR:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP0 Y A VPB phighvt m=3 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A VPB pfet_01v8_hvt m=3 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 Y A VNB 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
 .ENDS sky130_fd_sc_lp__invkapwr_2
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.netlist.tsv b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.netlist.tsv
index ab9764c..f7ebce1 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.netlist.tsv
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__invkapwr_2	A:I KAPWR: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
-MMIP0	MOSFET	Y	A	KAPWR	VPB	phighvt	3	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-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	KAPWR	VPB	pfet_01v8_hvt	3	1.26	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
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.spice b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.spice
index 459fd6f..70191fa 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.spice
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.spice
@@ -16,14 +16,9 @@
 
 
 .subckt sky130_fd_sc_lp__invkapwr_2 A KAPWR VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.226e+11p ps=2.74e+06u
-M1001 KAPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.867e+11p pd=6.13e+06u as=6.867e+11p ps=6.13e+06u
-M1002 KAPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 KAPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 Y A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.cdl b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.cdl
index f474e48..adb4d63 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.cdl
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__invkapwr_4 A KAPWR VGND VNB VPB VPWR Y
 *.PININFO A:I KAPWR:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP0 Y A VPB phighvt m=6 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A VPB pfet_01v8_hvt m=6 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 Y A VNB 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
 .ENDS sky130_fd_sc_lp__invkapwr_4
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.netlist.tsv b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.netlist.tsv
index f4d65e9..7d1bab9 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.netlist.tsv
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__invkapwr_4	A:I KAPWR: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
-MMIP0	MOSFET	Y	A	KAPWR	VPB	phighvt	6	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-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	KAPWR	VPB	pfet_01v8_hvt	6	1.26	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
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.spice b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.spice
index d884e39..5ffca16 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.spice
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__invkapwr_4 A KAPWR VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=3.402e+11p ps=4.14e+06u
-M1001 KAPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.3797e+12p pd=1.227e+07u as=1.0584e+12p ps=9.24e+06u
-M1002 KAPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 KAPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A KAPWR VPB phighvt w=1.26e+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 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 KAPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 KAPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 KAPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 Y A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 Y A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 Y A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.cdl b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.cdl
index d9f4a9c..56ba270 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.cdl
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__invkapwr_8 A KAPWR VGND VNB VPB VPWR Y
 *.PININFO A:I KAPWR:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP0 Y A VPB phighvt m=12 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 Y A VNB nshort m=8 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 Y A VPB pfet_01v8_hvt m=12 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 Y A VNB nfet_01v8 m=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
 .ENDS sky130_fd_sc_lp__invkapwr_8
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.netlist.tsv b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.netlist.tsv
index 62371de..4ad2870 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.netlist.tsv
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__invkapwr_8	A:I KAPWR: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
-MMIP0	MOSFET	Y	A	KAPWR	VPB	phighvt	12	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-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	KAPWR	VPB	pfet_01v8_hvt	12	1.26	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
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.spice b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.spice
index 7a46dcb..02ac08a 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.spice
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__invkapwr_8 A KAPWR VGND VNB VPB VPWR Y
-M1000 Y A KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.1168e+12p pd=1.848e+07u as=2.4318e+12p ps=2.15e+07u
-M1001 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=5.754e+11p pd=6.94e+06u as=4.704e+11p ps=5.6e+06u
-M1002 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 KAPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 KAPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 KAPWR A Y VPB phighvt w=1.26e+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
-M1010 Y A KAPWR VPB phighvt w=1.26e+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 KAPWR VPB phighvt w=1.26e+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 KAPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 KAPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 KAPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y A KAPWR VPB phighvt w=1.26e+06u 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 Y A KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 KAPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 KAPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 KAPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 KAPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 Y A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 Y A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 KAPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 Y A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 Y A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 Y A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 KAPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_0.cdl b/cells/invlp/sky130_fd_sc_lp__invlp_0.cdl
index 82d4429..861ef40 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_0.cdl
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_0.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__invlp_0 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A 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
-MI5 net14 A VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI5 net14 A 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
+MMIN1 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
-MMIN1 Y 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
-MI6 net22 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net22 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__invlp_0
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_0.netlist.tsv b/cells/invlp/sky130_fd_sc_lp__invlp_0.netlist.tsv
index 7ab0e29..d43e318 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_0.netlist.tsv
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_0.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__invlp_0	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	net14	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net14	A	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	net22	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net22	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	net14	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net14	A	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	net22	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net22	A	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/invlp/sky130_fd_sc_lp__invlp_0.spice b/cells/invlp/sky130_fd_sc_lp__invlp_0.spice
index d92aa7a..c52d1cf 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_0.spice
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_0.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__invlp_0 A VGND VNB VPB VPWR Y
-M1000 a_124_92# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1001 a_124_468# A VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.824e+11p ps=1.85e+06u
-M1002 Y A a_124_92# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1003 Y A a_124_468# VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
+X0 a_124_92# A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND A a_124_92# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR A a_124_468# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_124_468# A Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_1.cdl b/cells/invlp/sky130_fd_sc_lp__invlp_1.cdl
index 5cf4785..b8c5053 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_1.cdl
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__invlp_1 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net14 A VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MI5 net14 A VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Y A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Y A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net22 A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net22 A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__invlp_1
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_1.netlist.tsv b/cells/invlp/sky130_fd_sc_lp__invlp_1.netlist.tsv
index c0aff1b..ad7f254 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_1.netlist.tsv
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__invlp_1	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	net14	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net14	A	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	net22	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net22	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	net14	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net14	A	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	net22	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net22	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_1.spice b/cells/invlp/sky130_fd_sc_lp__invlp_1.spice
index 56caf0a..be80fd6 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_1.spice
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__invlp_1 A VGND VNB VPB VPWR Y
-M1000 a_130_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=3.591e+11p ps=3.09e+06u
-M1001 Y A a_124_47# VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=2.016e+11p ps=2.16e+06u
-M1002 Y A a_130_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1003 a_124_47# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.25e+06u
+X0 VPWR A a_130_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_130_367# A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_124_47# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VGND A a_124_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_2.cdl b/cells/invlp/sky130_fd_sc_lp__invlp_2.cdl
index b44ad5e..abcb201 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_2.cdl
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__invlp_2 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net17 A VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MI5 net17 A VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Y A VNB nfet_01v8 m=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
-MMIN1 Y A VNB nshort 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
-MI6 net22 A VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net22 A VNB nfet_01v8 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_lp__invlp_2
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_2.netlist.tsv b/cells/invlp/sky130_fd_sc_lp__invlp_2.netlist.tsv
index db1e3d4..e1cbc2e 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_2.netlist.tsv
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_2.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__invlp_2	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	net17	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net17	A	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	net22	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net22	A	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	net17	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net17	A	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	net22	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net22	A	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_2.spice b/cells/invlp/sky130_fd_sc_lp__invlp_2.spice
index ae15337..fe8b800 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_2.spice
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_2.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__invlp_2 A VGND VNB VPB VPWR Y
-M1000 VPWR A a_116_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=8.064e+11p pd=6.32e+06u as=7.056e+11p ps=6.16e+06u
-M1001 VGND A a_116_55# VNB nshort w=840000u l=150000u
-+  ad=4.788e+11p pd=4.5e+06u as=5.292e+11p ps=4.62e+06u
-M1002 a_116_55# A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1003 a_116_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_116_367# A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1005 Y A a_116_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_116_55# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A a_116_55# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_116_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND A a_116_55# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_116_55# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_116_55# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR A a_116_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 Y A a_116_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_116_367# A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 Y A a_116_55# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_4.cdl b/cells/invlp/sky130_fd_sc_lp__invlp_4.cdl
index 499e1fb..8dc527e 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_4.cdl
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__invlp_4 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB pfet_01v8_hvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net17 A VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MI5 net17 A VPB pfet_01v8_hvt m=4 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Y A VNB nfet_01v8 m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Y A VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net22 A VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net22 A VNB nfet_01v8 m=4 w=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_lp__invlp_4
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_4.netlist.tsv b/cells/invlp/sky130_fd_sc_lp__invlp_4.netlist.tsv
index 454586c..e648be6 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_4.netlist.tsv
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_4.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__invlp_4	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	net17	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net17	A	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	net22	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net22	A	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	net17	VPB	pfet_01v8_hvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net17	A	VPWR	VPB	pfet_01v8_hvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	net22	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net22	A	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_4.spice b/cells/invlp/sky130_fd_sc_lp__invlp_4.spice
index 2655958..a799bb7 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_4.spice
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_4.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__invlp_4 A VGND VNB VPB VPWR Y
-M1000 VGND A a_114_53# VNB nshort w=840000u l=150000u
-+  ad=8.316e+11p pd=7.02e+06u as=9.996e+11p ps=9.1e+06u
-M1001 a_118_367# A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4994e+12p pd=1.246e+07u as=8.82e+11p ps=6.44e+06u
-M1002 VPWR A a_118_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.1592e+12p pd=9.4e+06u as=0p ps=0u
-M1003 a_114_53# A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=5.292e+11p ps=4.62e+06u
-M1004 a_118_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_118_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A a_114_53# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A a_114_53# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A a_118_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A a_114_53# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_118_367# A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_114_53# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A a_118_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A a_118_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_114_53# A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_114_53# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_118_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_118_367# A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR A a_118_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_114_53# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_114_53# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 Y A a_118_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND A a_114_53# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_114_53# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 Y A a_114_53# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_118_367# A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR A a_118_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 Y A a_118_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 Y A a_114_53# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VGND A a_114_53# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_114_53# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_118_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_8.cdl b/cells/invlp/sky130_fd_sc_lp__invlp_8.cdl
index b3a7ddc..7a5b2af 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_8.cdl
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__invlp_8 A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB phighvt m=8 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Y A VPB pfet_01v8_hvt m=8 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net17 A VPB phighvt m=8 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net17 A VPB pfet_01v8_hvt m=8 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Y A VNB nfet_01v8 m=8 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Y A VNB nshort m=8 w=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 net25 A VNB nshort m=8 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI5 net25 A VNB nfet_01v8 m=8 w=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_lp__invlp_8
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_8.netlist.tsv b/cells/invlp/sky130_fd_sc_lp__invlp_8.netlist.tsv
index cb83c3c..a6a6738 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_8.netlist.tsv
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_8.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__invlp_8	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	net17	VPB	phighvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net17	A	VPWR	VPB	phighvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	net25	VNB	nshort	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net25	A	VGND	VNB	nshort	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	net17	VPB	pfet_01v8_hvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net17	A	VPWR	VPB	pfet_01v8_hvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	net25	VNB	nfet_01v8	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net25	A	VGND	VNB	nfet_01v8	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_8.spice b/cells/invlp/sky130_fd_sc_lp__invlp_8.spice
index fb2cf74..4967020 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_8.spice
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_8.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_lp__invlp_8 A VGND VNB VPB VPWR Y
-M1000 Y A a_114_53# VNB nshort w=840000u l=150000u
-+  ad=9.996e+11p pd=9.1e+06u as=1.9992e+12p ps=1.82e+07u
-M1001 a_114_53# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=1.1844e+12p ps=1.122e+07u
-M1002 a_114_53# A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A a_114_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.953e+12p pd=1.57e+07u as=2.8224e+12p ps=2.464e+07u
-M1004 a_114_53# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A a_114_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4994e+12p pd=1.246e+07u as=0p ps=0u
-M1006 VPWR A a_114_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_114_53# A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_114_367# A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_114_53# A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_114_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A a_114_53# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_114_367# A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A a_114_53# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A a_114_53# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A a_114_53# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_114_53# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A a_114_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_114_367# A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_114_367# A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_114_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_114_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_114_53# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A a_114_53# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y A a_114_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_114_53# A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y A a_114_53# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y A a_114_53# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR A a_114_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_114_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y A a_114_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y A a_114_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A a_114_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_114_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_114_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_114_53# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 Y A a_114_53# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_114_367# A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_114_367# A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VPWR A a_114_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND A a_114_53# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_114_53# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VPWR A a_114_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 Y A a_114_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_114_53# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_114_53# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_114_367# A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 Y A a_114_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_114_53# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 Y A a_114_53# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_114_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VPWR A a_114_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 a_114_367# A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 VGND A a_114_53# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 a_114_53# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 Y A a_114_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 VGND A a_114_53# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 Y A a_114_53# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 VPWR A a_114_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 VGND A a_114_53# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X28 a_114_53# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 a_114_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 a_114_53# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X31 Y A a_114_53# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_m.cdl b/cells/invlp/sky130_fd_sc_lp__invlp_m.cdl
index 3a88baa..e91a460 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_m.cdl
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_m.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__invlp_m A VGND VNB VPB VPWR Y
 *.PININFO A:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMIP1 Y A VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 Y 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
-MI6 net14 A VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net14 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
+MMIN1 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
-MMIN1 Y 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
-MI5 net22 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI5 net22 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__invlp_m
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_m.netlist.tsv b/cells/invlp/sky130_fd_sc_lp__invlp_m.netlist.tsv
index ffdd93e..c91f9f9 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_m.netlist.tsv
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_m.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__invlp_m	A:I VGND:I VNB:I VPB:I VPWR:I Y:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MMIP1	MOSFET	Y	A	net14	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net14	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Y	A	net22	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net22	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Y	A	net14	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net14	A	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Y	A	net22	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net22	A	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/invlp/sky130_fd_sc_lp__invlp_m.spice b/cells/invlp/sky130_fd_sc_lp__invlp_m.spice
index 410c98c..e80517e 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_m.spice
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_m.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__invlp_m A VGND VNB VPB VPWR Y
-M1000 a_124_92# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1001 a_124_490# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1002 Y A a_124_490# VPB phighvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1003 Y A a_124_92# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
+X0 a_124_92# A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND A a_124_92# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_124_490# A Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VPWR A a_124_490# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.cdl b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.cdl
index c9fe879..6494295 100644
--- a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.cdl
+++ b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__iso0n_lp A KAGND SLEEP_B VGND VNB VPB VPWR X
 *.PININFO A:I KAGND:I SLEEP_B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MI14 X net55 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI14 X 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
-MMN0 net55 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 net55 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 sndA SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI13 sndA SLEEP_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
-MI20 net38 net55 VNB nshort m=1 w=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 net58 SLEEP_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI20 net38 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
-MI12 net62 net55 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MMP1 net58 SLEEP_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
-MI11 net54 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
-MI19 X net55 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net55 SLEEP_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI12 net62 net55 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI17 net55 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
+MI11 net54 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
+MI19 X net55 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net55 SLEEP_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
+MI17 net55 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_lp__iso0n_lp
diff --git a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.netlist.tsv b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.netlist.tsv
index aef06a3..76fc8d9 100644
--- a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.netlist.tsv
+++ b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__iso0n_lp	A:I KAGND:I SLEEP_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
-MI14	MOSFET	X	net55	net38	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	net55	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	sndA	SLEEP_B	KAGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net38	net55	KAGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	net58	SLEEP_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net62	net55	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net54	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	X	net55	net62	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net55	SLEEP_B	net58	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	net55	A	net54	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	X	net55	net38	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	net55	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	sndA	SLEEP_B	KAGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net38	net55	KAGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	net58	SLEEP_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net62	net55	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net54	A	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	X	net55	net62	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net55	SLEEP_B	net58	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	net55	A	net54	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/iso0n/sky130_fd_sc_lp__iso0n_lp.spice b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.spice
index 9ddcdab..0fd8ea1 100644
--- a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.spice
+++ b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__iso0n_lp A KAGND SLEEP_B VGND VNB VPB VPWR X
-M1000 a_307_489# SLEEP_B a_138_93# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1001 VPWR SLEEP_B a_307_489# VPB phighvt w=420000u l=150000u
-+  ad=5.103e+11p pd=4.73e+06u as=0p ps=0u
-M1002 a_493_93# a_138_93# KAGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.57e+11p ps=2.54e+06u
-M1003 a_493_367# a_138_93# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1004 X a_138_93# a_493_93# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1005 a_138_93# A a_149_489# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1006 X a_138_93# a_493_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1007 a_221_93# A a_138_93# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1008 KAGND SLEEP_B a_221_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_149_489# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_221_93# SLEEP_B KAGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_493_93# a_138_93# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_138_93# SLEEP_B a_307_489# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_149_489# A a_138_93# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_307_489# SLEEP_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_138_93# A a_221_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 KAGND a_138_93# a_493_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR A a_149_489# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VPWR a_138_93# a_493_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_493_367# a_138_93# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.cdl b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.cdl
index 44e4b88..7709638 100644
--- a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.cdl
+++ b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.cdl
@@ -16,18 +16,18 @@
 
 .SUBCKT sky130_fd_sc_lp__iso0n_lp2 A SLEEP_B KAGND VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP_B:I KAGND:I VGND:I VNB:I VPB:I VPWR:I X:O
-MI14 X net48 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI14 X net48 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 net48 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 net48 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI13 sndA SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI13 sndA SLEEP_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
-MI20 net31 net48 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI20 net31 net48 VNB nfet_01v8 m=1 w=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 net48 SLEEP_B 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
+MI12 X net48 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
-MMP1 net48 SLEEP_B 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
-MI12 X net48 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
-MI11 net48 A VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI11 net48 A 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_lp__iso0n_lp2
diff --git a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.netlist.tsv b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.netlist.tsv
index 5f78310..58a4aa2 100644
--- a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.netlist.tsv
+++ b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.netlist.tsv
@@ -1,9 +1,9 @@
 sky130_fd_sc_lp__iso0n_lp2	A:I SLEEP_B:I KAGND: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
-MI14	MOSFET	X	net48	net31	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	net48	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	sndA	SLEEP_B	KAGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net31	net48	KAGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	net48	SLEEP_B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	X	net48	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net48	A	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	X	net48	net31	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	net48	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	sndA	SLEEP_B	KAGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net31	net48	KAGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	net48	SLEEP_B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	X	net48	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net48	A	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/iso0n/sky130_fd_sc_lp__iso0n_lp2.spice b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.spice
index 5d2fa7d..cfe9957 100644
--- a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.spice
+++ b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.spice
@@ -16,18 +16,11 @@
 
 
 .subckt sky130_fd_sc_lp__iso0n_lp2 A SLEEP_B KAGND VGND VNB VPB VPWR X
-M1000 VPWR SLEEP_B a_65_65# VPB phighvt w=1e+06u l=250000u
-+  ad=6.3e+11p pd=5.26e+06u as=2.8e+11p ps=2.56e+06u
-M1001 a_152_65# A a_65_65# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1002 KAGND SLEEP_B a_152_65# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1003 X a_65_65# a_316_65# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.008e+11p ps=1.32e+06u
-M1004 a_316_65# a_65_65# KAGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_65_65# A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_65_65# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
+X0 VPWR A a_65_65# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_65_65# A a_152_65# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_316_65# a_65_65# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR a_65_65# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 KAGND a_65_65# a_316_65# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_65_65# SLEEP_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_152_65# SLEEP_B KAGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.cdl b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.cdl
index d4960b4..3edf07f 100644
--- a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.cdl
+++ b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__iso0p_lp A KAPWR SLEEP VGND VNB VPB VPWR X
 *.PININFO A:I KAPWR:I SLEEP:I VGND:I VNB:I VPB:I VPWR:I X:O
-MI9 X y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI8 net43 A VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 X y VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 sleepb SLEEP VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI8 net43 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
-MI7 net47 sleepb VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMIP0 sleepb SLEEP VPB pfet_01v8_hvt m=1 w=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 net71 y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 net63 SLEEP VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI7 net47 sleepb VPB pfet_01v8_hvt m=1 w=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 y sleepb VPB phighvt m=1 w=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 y 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
-MMIN0 sleepb SLEEP VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI20 net71 y VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 y 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
-MI21 net88 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI19 net63 SLEEP VPB pfet_01v8_hvt m=1 w=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 y sleepb VPB pfet_01v8_hvt m=1 w=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 y 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
-MI18 net84 SLEEP VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 sleepb SLEEP VNB nfet_01v8 m=1 w=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 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
-MI12 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI11 sndA sleepb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI21 net88 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net84 SLEEP VNB nfet_01v8 m=1 w=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 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 sndA sleepb VNB nfet_01v8 m=1 w=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_lp__iso0p_lp
diff --git a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.netlist.tsv b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.netlist.tsv
index 227f3f7..709dc14 100644
--- a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.netlist.tsv
+++ b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__iso0p_lp	A:I KAPWR:I SLEEP: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
-MI9	MOSFET	X	y	net71	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net43	A	KAPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	sleepb	SLEEP	net63	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net47	sleepb	KAPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net71	y	KAPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	net63	SLEEP	KAPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	y	sleepb	net47	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	y	A	net43	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	sleepb	SLEEP	net84	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net88	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net84	SLEEP	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	X	y	net88	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	sndA	sleepb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	X	y	net71	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net43	A	KAPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	sleepb	SLEEP	net63	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net47	sleepb	KAPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net71	y	KAPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	net63	SLEEP	KAPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	y	sleepb	net47	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	y	A	net43	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	sleepb	SLEEP	net84	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net88	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net84	SLEEP	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	X	y	net88	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	sndA	sleepb	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/iso0p/sky130_fd_sc_lp__iso0p_lp.spice b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.spice
index 02388f7..dfdf7d4 100644
--- a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.spice
+++ b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__iso0p_lp A KAPWR SLEEP VGND VNB VPB VPWR X
-M1000 a_432_489# A a_342_489# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.26e+11p ps=1.44e+06u
-M1001 a_342_489# A a_340_93# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1002 KAPWR SLEEP a_112_489# VPB phighvt w=420000u l=150000u
-+  ad=4.83e+11p pd=4.6e+06u as=8.82e+10p ps=1.26e+06u
-M1003 a_602_93# a_342_489# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.759e+11p ps=3.47e+06u
-M1004 X a_342_489# a_602_93# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1005 a_112_489# SLEEP a_27_93# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1006 VGND SLEEP a_112_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1007 a_340_93# a_27_93# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_602_367# a_342_489# KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1009 X a_342_489# a_602_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1010 KAPWR A a_432_489# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_270_489# a_27_93# KAPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1012 a_112_93# SLEEP a_27_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1013 a_342_489# a_27_93# a_270_489# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_342_489# A a_432_489# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VGND a_342_489# a_602_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_112_93# SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_27_93# SLEEP a_112_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_112_489# SLEEP KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_27_93# SLEEP a_112_489# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VGND a_27_93# a_340_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 KAPWR a_342_489# a_602_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_602_367# a_342_489# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_432_489# A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_340_93# A a_342_489# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 KAPWR a_27_93# a_270_489# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 a_270_489# a_27_93# a_342_489# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 a_602_93# a_342_489# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.cdl b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.cdl
index cc7c67c..f597302 100644
--- a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.cdl
+++ b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__iso0p_lp2 A SLEEP KAPWR VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP:I KAPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
-MI8 y A 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
-MI7 y sleepb VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI8 y A 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
-MI20 X y 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
-MI19 sleepb SLEEP VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI7 y sleepb 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
-MMIN0 sleepb SLEEP VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI20 X y 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
+MI19 sleepb SLEEP 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
-MI10 y 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
-MI21 net64 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 sleepb SLEEP VNB nfet_01v8 m=1 w=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 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
-MI18 net60 SLEEP VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI21 net64 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MI11 sndA sleepb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI18 net60 SLEEP VNB nfet_01v8 m=1 w=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 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 sndA sleepb VNB nfet_01v8 m=1 w=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_lp__iso0p_lp2
diff --git a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.netlist.tsv b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.netlist.tsv
index 8b161cc..34f5e0d 100644
--- a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.netlist.tsv
+++ b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__iso0p_lp2	A:I SLEEP:I KAPWR: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
-MI8	MOSFET	y	A	KAPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	y	sleepb	KAPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	X	y	KAPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	sleepb	SLEEP	KAPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	sleepb	SLEEP	net60	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net64	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net60	SLEEP	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	X	y	net64	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	sndA	sleepb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	y	A	KAPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	y	sleepb	KAPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	X	y	KAPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	sleepb	SLEEP	KAPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	sleepb	SLEEP	net60	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net64	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net60	SLEEP	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	X	y	net64	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	sndA	sleepb	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/iso0p/sky130_fd_sc_lp__iso0p_lp2.spice b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.spice
index dcf8267..ef0db09 100644
--- a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.spice
+++ b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__iso0p_lp2 A SLEEP KAPWR VGND VNB VPB VPWR X
-M1000 a_342_417# A a_340_93# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1001 a_602_93# a_342_417# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.759e+11p ps=3.47e+06u
-M1002 X a_342_417# a_602_93# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1003 VGND SLEEP a_112_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1004 a_340_93# a_27_93# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 KAPWR A a_342_417# VPB phighvt w=1e+06u l=250000u
-+  ad=1.66e+12p pd=7.32e+06u as=3e+11p ps=2.6e+06u
-M1006 X a_342_417# KAPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1007 KAPWR SLEEP a_27_93# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.75e+11p ps=2.55e+06u
-M1008 a_112_93# SLEEP a_27_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1009 a_342_417# a_27_93# KAPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 KAPWR a_342_417# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 VGND a_342_417# a_602_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_27_93# SLEEP KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_112_93# SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 KAPWR a_27_93# a_342_417# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_27_93# SLEEP a_112_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_27_93# a_340_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_340_93# A a_342_417# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_342_417# A KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_602_93# a_342_417# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.cdl b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.cdl
index f5a351b..b6285bf 100644
--- a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.cdl
+++ b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__iso1n_lp A KAGND SLEEP_B VGND VNB VPB VPWR X
 *.PININFO A:I KAGND:I SLEEP_B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MI23 VPWR sleep VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net59 net75 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 VPWR net75 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP0 sleep SLEEP_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI23 VPWR sleep VPB pfet_01v8_hvt m=1 w=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 sndPA 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
-MI21 net50 SLEEP_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI8 net59 net75 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 sleep SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI24 VPWR net75 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net91 net75 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 sleep SLEEP_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
+MI7 sndPA 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
+MI21 net50 SLEEP_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
+MMIN0 sleep SLEEP_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
+MI27 net91 net75 VNB nfet_01v8 m=1 w=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 net87 sleep VNB nfet_01v8 m=1 w=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 net75 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
-MI26 net87 sleep VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X net75 VNB nfet_01v8 m=1 w=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 net75 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 net75 sleep VNB nfet_01v8 m=1 w=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 net71 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X net75 VNB nshort m=1 w=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 net75 sleep VNB nshort m=1 w=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 net71 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
-MI22 net67 SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI22 net67 SLEEP_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
 .ENDS sky130_fd_sc_lp__iso1n_lp
diff --git a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.netlist.tsv b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.netlist.tsv
index 3b4fab1..860c247 100644
--- a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.netlist.tsv
+++ b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__iso1n_lp	A:I KAGND:I SLEEP_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
-MI23	MOSFET	VPWR	sleep	sndPA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net59	net75	X	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	VPWR	net75	net59	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	sleep	SLEEP_B	net50	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	sndPA	A	net75	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net50	SLEEP_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	sleep	SLEEP_B	net67	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net91	net75	KAGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net87	sleep	KAGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net75	A	net71	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	net75	net91	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net75	sleep	net87	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net71	A	KAGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net67	SLEEP_B	KAGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	VPWR	sleep	sndPA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net59	net75	X	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	VPWR	net75	net59	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP0	MOSFET	sleep	SLEEP_B	net50	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	sndPA	A	net75	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net50	SLEEP_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	sleep	SLEEP_B	net67	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net91	net75	KAGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net87	sleep	KAGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net75	A	net71	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	net75	net91	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net75	sleep	net87	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net71	A	KAGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net67	SLEEP_B	KAGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.spice b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.spice
index 53a6cde..0f2151f 100644
--- a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.spice
+++ b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__iso1n_lp A KAGND SLEEP_B VGND VNB VPB VPWR X
-M1000 a_340_489# a_27_93# VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=4.977e+11p ps=4.67e+06u
-M1001 KAGND SLEEP_B a_110_93# VNB nshort w=420000u l=150000u
-+  ad=2.478e+11p pd=2.86e+06u as=8.82e+10p ps=1.26e+06u
-M1002 a_438_93# A a_340_93# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.428e+11p ps=1.52e+06u
-M1003 a_602_93# a_340_93# KAGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 a_154_489# SLEEP_B a_27_93# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.113e+11p ps=1.37e+06u
-M1005 X a_340_93# a_602_93# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 a_110_93# SLEEP_B a_27_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 a_340_93# a_27_93# a_268_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1008 a_602_367# a_340_93# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1009 VPWR SLEEP_B a_154_489# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_340_93# a_602_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1011 a_268_93# a_27_93# KAGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 KAGND A a_438_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_340_93# A a_340_489# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 a_27_93# SLEEP_B a_110_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_438_93# A KAGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_340_93# A a_438_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_27_93# SLEEP_B a_154_489# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_340_489# A a_340_93# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 KAGND a_27_93# a_268_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 KAGND a_340_93# a_602_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_268_93# a_27_93# a_340_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_27_93# a_340_489# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VPWR a_340_93# a_602_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_602_367# a_340_93# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_154_489# SLEEP_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 a_602_93# a_340_93# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_110_93# SLEEP_B KAGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.cdl b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.cdl
index e5aa114..5f2b326 100644
--- a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.cdl
+++ b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__iso1n_lp2 A SLEEP_B KAGND VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP_B:I KAGND:I VGND:I VNB:I VPB:I VPWR:I X:O
-MI23 VPWR sleep 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
-MI24 VPWR net63 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
-MI7 sndPA A 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
-MI21 sleep SLEEP_B 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
-MMIN0 sleep SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI23 VPWR sleep 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
-MI27 net79 net63 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI24 VPWR net63 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
+MI7 sndPA A 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
-MI26 net75 sleep VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI21 sleep SLEEP_B 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
+MMIN0 sleep SLEEP_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
+MI27 net79 net63 VNB nfet_01v8 m=1 w=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 net75 sleep VNB nfet_01v8 m=1 w=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 net63 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
-MI25 net63 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X net63 VNB nfet_01v8 m=1 w=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 net63 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 net63 sleep VNB nfet_01v8 m=1 w=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 net59 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 net63 sleep VNB nshort m=1 w=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 net59 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
-MI22 net55 SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI22 net55 SLEEP_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
 .ENDS sky130_fd_sc_lp__iso1n_lp2
diff --git a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.netlist.tsv b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.netlist.tsv
index 3289a6e..4c50517 100644
--- a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.netlist.tsv
+++ b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__iso1n_lp2	A:I SLEEP_B:I KAGND: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
-MI23	MOSFET	VPWR	sleep	sndPA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	VPWR	net63	X	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	sndPA	A	net63	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	sleep	SLEEP_B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	sleep	SLEEP_B	net55	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net79	net63	KAGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net75	sleep	KAGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net63	A	net59	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	net63	net79	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net63	sleep	net75	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net59	A	KAGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net55	SLEEP_B	KAGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	VPWR	sleep	sndPA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	VPWR	net63	X	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	sndPA	A	net63	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	sleep	SLEEP_B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	sleep	SLEEP_B	net55	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net79	net63	KAGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net75	sleep	KAGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net63	A	net59	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	net63	net79	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net63	sleep	net75	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net59	A	KAGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net55	SLEEP_B	KAGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.spice b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.spice
index 4251bc1..b312749 100644
--- a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.spice
+++ b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__iso1n_lp2 A SLEEP_B KAGND VGND VNB VPB VPWR X
-M1000 VPWR SLEEP_B a_27_109# VPB phighvt w=1e+06u l=250000u
-+  ad=6.05e+11p pd=5.21e+06u as=2.85e+11p ps=2.57e+06u
-M1001 a_114_109# SLEEP_B a_27_109# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1002 a_350_109# A a_300_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=2.4e+11p ps=2.48e+06u
-M1003 X a_350_109# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1004 a_350_109# a_27_109# a_272_109# VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=1.008e+11p ps=1.32e+06u
-M1005 X a_350_109# a_610_109# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1006 KAGND SLEEP_B a_114_109# VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=0p ps=0u
-M1007 a_300_409# a_27_109# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_272_109# a_27_109# KAGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 KAGND A a_452_109# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1010 a_610_109# a_350_109# KAGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_452_109# A a_350_109# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_300_409# A a_350_109# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_452_109# A KAGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_27_109# a_300_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_610_109# a_350_109# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 KAGND a_350_109# a_610_109# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_114_109# SLEEP_B KAGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_27_109# SLEEP_B a_114_109# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_350_109# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_27_109# SLEEP_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 KAGND a_27_109# a_272_109# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_350_109# A a_452_109# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_272_109# a_27_109# a_350_109# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.cdl b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.cdl
index abbe2ed..8222458 100644
--- a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.cdl
+++ b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__iso1p_lp A KAPWR SLEEP VGND VNB VPB VPWR X
 *.PININFO A:I KAPWR:I SLEEP:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 KAPWR SLEEP VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMP0 KAPWR SLEEP VPB pfet_01v8_hvt m=1 w=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 sndPA 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
-MI8 net36 net64 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 KAPWR net64 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MI7 sndPA 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
-MI10 net68 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net36 net64 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI15 KAPWR net64 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 net68 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 net64 SLEEP VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 net64 SLEEP VNB nfet_01v8 m=1 w=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 net64 VNB nfet_01v8 m=1 w=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 net64 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI17 net64 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
-MI17 net64 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 net52 SLEEP VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 net48 net64 VNB nshort m=1 w=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 net52 SLEEP VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 net48 net64 VNB nfet_01v8 m=1 w=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_lp__iso1p_lp
diff --git a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.netlist.tsv b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.netlist.tsv
index f4b8263..8ae372b 100644
--- a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.netlist.tsv
+++ b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__iso1p_lp	A:I KAPWR:I SLEEP: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	KAPWR	SLEEP	sndPA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	sndPA	A	net64	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net36	net64	X	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	KAPWR	net64	net36	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net68	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net64	SLEEP	net52	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	net64	net48	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	net64	A	net68	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net52	SLEEP	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	net48	net64	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	KAPWR	SLEEP	sndPA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	sndPA	A	net64	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net36	net64	X	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	KAPWR	net64	net36	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net68	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net64	SLEEP	net52	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	net64	net48	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	net64	A	net68	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net52	SLEEP	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	net48	net64	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/iso1p/sky130_fd_sc_lp__iso1p_lp.spice b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.spice
index 91b077d..1a63c86 100644
--- a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.spice
+++ b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__iso1p_lp A KAPWR SLEEP VGND VNB VPB VPWR X
-M1000 KAPWR SLEEP a_245_489# VPB phighvt w=420000u l=150000u
-+  ad=5.292e+11p pd=3.98e+06u as=8.82e+10p ps=1.26e+06u
-M1001 a_335_93# SLEEP a_161_489# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1002 a_493_93# a_161_489# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.289e+11p ps=2.77e+06u
-M1003 a_493_367# a_161_489# KAPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1004 X a_161_489# a_493_93# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1005 a_245_489# A a_161_489# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1006 X a_161_489# a_493_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1007 a_177_93# A VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1008 a_161_489# A a_177_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND SLEEP a_335_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_493_93# a_161_489# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_245_489# SLEEP KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_177_93# A a_161_489# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_161_489# SLEEP a_335_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_335_93# SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_161_489# a_493_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND A a_177_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_161_489# A a_245_489# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 KAPWR a_161_489# a_493_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_493_367# a_161_489# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.cdl b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.cdl
index bef811d..c38f622 100644
--- a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.cdl
+++ b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.cdl
@@ -16,22 +16,22 @@
 
 .SUBCKT sky130_fd_sc_lp__iso1p_lp2 A SLEEP KAPWR VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP:I KAPWR:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 KAPWR SLEEP VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 KAPWR SLEEP 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
+MI7 sndPA A 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
-MI7 sndPA A VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI15 KAPWR net58 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
+MI10 net62 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
-MI15 KAPWR net58 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI9 net58 SLEEP VNB nfet_01v8 m=1 w=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 net58 VNB nfet_01v8 m=1 w=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 net62 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI17 net58 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 net58 SLEEP VNB nshort m=1 w=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 net58 VNB nshort m=1 w=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 net58 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 net46 SLEEP VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI14 net42 net58 VNB nshort m=1 w=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 net46 SLEEP VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI14 net42 net58 VNB nfet_01v8 m=1 w=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_lp__iso1p_lp2
diff --git a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.netlist.tsv b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.netlist.tsv
index 6d48672..8037223 100644
--- a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.netlist.tsv
+++ b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.netlist.tsv
@@ -1,11 +1,11 @@
 sky130_fd_sc_lp__iso1p_lp2	A:I SLEEP:I KAPWR: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	KAPWR	SLEEP	sndPA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	sndPA	A	net58	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	KAPWR	net58	X	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net62	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net58	SLEEP	net46	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	net58	net42	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	net58	A	net62	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net46	SLEEP	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI14	MOSFET	net42	net58	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	KAPWR	SLEEP	sndPA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	sndPA	A	net58	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	KAPWR	net58	X	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net62	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net58	SLEEP	net46	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	net58	net42	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	net58	A	net62	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net46	SLEEP	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI14	MOSFET	net42	net58	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/iso1p/sky130_fd_sc_lp__iso1p_lp2.spice b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.spice
index e8bfcc3..fd20502 100644
--- a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.spice
+++ b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.spice
@@ -16,22 +16,13 @@
 
 
 .subckt sky130_fd_sc_lp__iso1p_lp2 A SLEEP KAPWR VGND VNB VPB VPWR X
-M1000 a_137_409# A a_147_57# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.008e+11p ps=1.32e+06u
-M1001 a_469_57# a_137_409# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.373e+11p ps=2.81e+06u
-M1002 X a_137_409# a_469_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1003 a_240_409# A a_137_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.1e+11p pd=2.42e+06u as=2.65e+11p ps=2.53e+06u
-M1004 KAPWR SLEEP a_240_409# VPB phighvt w=1e+06u l=250000u
-+  ad=6.2e+11p pd=3.24e+06u as=0p ps=0u
-M1005 X a_137_409# KAPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1006 a_147_57# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_311_57# SLEEP a_137_409# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1008 VGND SLEEP a_311_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_137_409# A a_240_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 VGND A a_147_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND a_137_409# a_469_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_147_57# A a_137_409# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_137_409# SLEEP a_311_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_240_409# SLEEP KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_469_57# a_137_409# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 KAPWR a_137_409# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_311_57# SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.cdl b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.cdl
index d727d49..9082594 100644
--- a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.cdl
+++ b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__isobufsrc_1 A SLEEP VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR SLEEP VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR SLEEP VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA Ab VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 X SLEEP VNB nfet_01v8 m=1 w=0.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 Ab VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 X Ab VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Ab 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
-MMN0 X SLEEP VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 X Ab VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Ab A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__isobufsrc_1
diff --git a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.netlist.tsv b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.netlist.tsv
index e95672e..3a4d5b9 100644
--- a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.netlist.tsv
+++ b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__isobufsrc_1	A:I SLEEP: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	SLEEP	sndPA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	Ab	X	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	X	SLEEP	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	X	Ab	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Ab	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	SLEEP	sndPA	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	Ab	X	VPB	pfet_01v8_hvt	1	1.26	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	X	SLEEP	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	X	Ab	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	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/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.spice b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.spice
index 30fc4da..5bf0edd 100644
--- a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.spice
+++ b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__isobufsrc_1 A SLEEP VGND VNB VPB VPWR X
-M1000 X a_79_47# a_283_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.174e+11p pd=3.5e+06u as=2.646e+11p ps=2.94e+06u
-M1001 VGND a_79_47# X VNB nshort w=840000u l=150000u
-+  ad=5.334e+11p pd=4.8e+06u as=2.352e+11p ps=2.24e+06u
-M1002 VGND A a_79_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1003 VPWR A a_79_47# VPB phighvt w=420000u l=150000u
-+  ad=3.864e+11p pd=3.3e+06u as=1.113e+11p ps=1.37e+06u
-M1004 X SLEEP VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_283_367# SLEEP VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR SLEEP a_283_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_283_367# a_79_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_79_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND SLEEP X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_79_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 X a_79_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.cdl b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.cdl
index 70bd2f5..9e2843d 100644
--- a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.cdl
+++ b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__isobufsrc_2 A SLEEP VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR SLEEP VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR SLEEP VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA Ab VPB pfet_01v8_hvt m=2 w=1.26 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 X SLEEP VNB nfet_01v8 m=2 w=0.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 Ab VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 X Ab VNB nfet_01v8 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 Ab 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
-MMN0 X SLEEP VNB nshort 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
-MMN1 X Ab VNB nshort 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
-MMIN1 Ab A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__isobufsrc_2
diff --git a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.netlist.tsv b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.netlist.tsv
index 2cb9514..407189e 100644
--- a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.netlist.tsv
+++ b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__isobufsrc_2	A:I SLEEP: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	SLEEP	sndPA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	Ab	X	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	X	SLEEP	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	X	Ab	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Ab	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	SLEEP	sndPA	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	Ab	X	VPB	pfet_01v8_hvt	2	1.26	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	X	SLEEP	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	X	Ab	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	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/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.spice b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.spice
index a5e3ff0..2c837ac 100644
--- a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.spice
+++ b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__isobufsrc_2 A SLEEP VGND VNB VPB VPWR X
-M1000 VGND SLEEP X VNB nshort w=840000u l=150000u
-+  ad=1.0038e+12p pd=7.52e+06u as=4.704e+11p ps=4.48e+06u
-M1001 VGND A a_40_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1002 a_283_367# a_40_131# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=3.528e+11p ps=3.08e+06u
-M1003 VPWR A a_40_131# VPB phighvt w=420000u l=150000u
-+  ad=7.14e+11p pd=6.32e+06u as=1.113e+11p ps=1.37e+06u
-M1004 VGND a_40_131# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_40_131# a_283_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_40_131# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X SLEEP VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR SLEEP a_283_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_283_367# SLEEP VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_40_131# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_283_367# SLEEP VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 X SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_283_367# a_40_131# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR SLEEP a_283_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND SLEEP X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 X a_40_131# a_283_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_40_131# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_40_131# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 X a_40_131# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.cdl b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.cdl
index f3760c8..3175df0 100644
--- a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.cdl
+++ b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__isobufsrc_4 A SLEEP VGND VNB VPB VPWR X
 *.PININFO A:I SLEEP:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMP0 VPWR SLEEP VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR SLEEP VPB pfet_01v8_hvt m=4 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMP1 sndPA Ab VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 X SLEEP VNB nfet_01v8 m=4 w=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 Ab VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 X Ab VNB nfet_01v8 m=4 w=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 Ab A VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 X SLEEP VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 X Ab VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Ab A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 Ab A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__isobufsrc_4
diff --git a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.netlist.tsv b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.netlist.tsv
index 6bd7305..f3cb386 100644
--- a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.netlist.tsv
+++ b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__isobufsrc_4	A:I SLEEP: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	SLEEP	sndPA	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	Ab	X	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	X	SLEEP	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	X	Ab	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Ab	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	VPWR	SLEEP	sndPA	VPB	pfet_01v8_hvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	Ab	X	VPB	pfet_01v8_hvt	4	1.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	X	SLEEP	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	X	Ab	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Ab	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.spice b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.spice
index 81a414c..d34a43e 100644
--- a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.spice
+++ b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_lp__isobufsrc_4 A SLEEP VGND VNB VPB VPWR X
-M1000 a_245_367# SLEEP VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=1.1403e+12p ps=9.37e+06u
-M1001 VGND SLEEP X VNB nshort w=840000u l=150000u
-+  ad=1.2306e+12p pd=1.133e+07u as=9.408e+11p ps=8.96e+06u
-M1002 X SLEEP VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_245_367# a_60_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1004 X a_60_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR SLEEP a_245_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_60_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_60_47# a_245_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_60_47# a_245_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X SLEEP VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_60_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_245_367# a_60_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A a_60_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1013 VPWR A a_60_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1014 a_245_367# SLEEP VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR SLEEP a_245_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND SLEEP X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_60_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_245_367# SLEEP VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 X a_60_47# a_245_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 X SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_60_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 X a_60_47# a_245_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VPWR SLEEP a_245_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND a_60_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VPWR SLEEP a_245_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_245_367# SLEEP VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 X SLEEP VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_60_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VGND SLEEP X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_245_367# a_60_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 X a_60_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_245_367# a_60_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VGND SLEEP X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 X a_60_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 VGND a_60_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.cdl b/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.cdl
index 4bf44da..fb08c10 100644
--- a/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.cdl
+++ b/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.cdl
@@ -16,44 +16,44 @@
 
 .SUBCKT sky130_fd_sc_lp__isolatch_lp D SLEEP_B KAPWR VGND VNB VPB VPWR Q
 *.PININFO D:I SLEEP_B:I KAPWR:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI673 net53 net47 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI673 net53 net47 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI677 Q s0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI677 Q 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
-MI636 sleepneg sleeppos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 sleepneg sleeppos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI674 net47 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
-MI674 net47 s0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI19 s0 sleepneg VNB nfet_01v8 m=1 w=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 net65 D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 s0 sleepneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 net69 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 s0 sleeppos VNB nfet_01v8 m=1 w=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 net50 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
+MI654 net81 net47 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI671 net37 SLEEP_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
+MI670 sleeppos SLEEP_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
+MI643 sleeppos SLEEP_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
+MI635 sleepneg sleeppos 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
+MI662 net106 net47 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
+MI664 s0 sleepneg 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
+MI658 net47 s0 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
+MI663 Q s0 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
-MI20 net65 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 net69 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 s0 sleeppos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI17 s0 sleeppos VPB pfet_01v8_hvt m=1 w=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 net50 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
-MI654 net81 net47 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI18 net86 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
-MI671 net37 SLEEP_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
-MI670 sleeppos SLEEP_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
-MI643 sleeppos SLEEP_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
-MI635 sleepneg sleeppos VPB phighvt 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
-MI662 net106 net47 VPB phighvt 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
-MI664 s0 sleepneg VPB phighvt 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
-MI658 net47 s0 VPB phighvt 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
-MI663 Q s0 VPB phighvt 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
-MI17 s0 sleeppos VPB phighvt m=1 w=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 net86 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
 .ENDS sky130_fd_sc_lp__isolatch_lp
diff --git a/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.netlist.tsv b/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.netlist.tsv
index 8cd17b4..120f9d5 100644
--- a/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.netlist.tsv
+++ b/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.netlist.tsv
@@ -1,22 +1,22 @@
 sky130_fd_sc_lp__isolatch_lp	D:I SLEEP_B:I KAPWR: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
-MI673	MOSFET	net53	net47	net81	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	Q	s0	net50	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	sleepneg	sleeppos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI674	MOSFET	net47	s0	net69	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	s0	sleepneg	net65	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net65	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net69	s0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	sleeppos	net53	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net50	s0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net81	net47	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI671	MOSFET	net37	SLEEP_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	sleeppos	SLEEP_B	net37	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	sleeppos	SLEEP_B	KAPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	sleepneg	sleeppos	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net106	net47	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	sleepneg	net106	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net47	s0	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	Q	s0	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	s0	sleeppos	net86	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net86	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI673	MOSFET	net53	net47	net81	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	Q	s0	net50	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	sleepneg	sleeppos	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI674	MOSFET	net47	s0	net69	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	s0	sleepneg	net65	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net65	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net69	s0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	sleeppos	net53	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net50	s0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net81	net47	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI671	MOSFET	net37	SLEEP_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	sleeppos	SLEEP_B	net37	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	sleeppos	SLEEP_B	KAPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	sleepneg	sleeppos	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net106	net47	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	sleepneg	net106	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net47	s0	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	Q	s0	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	s0	sleeppos	net86	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net86	D	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/isolatch/sky130_fd_sc_lp__isolatch_lp.spice b/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.spice
index 482d00e..a4c8ad6 100644
--- a/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.spice
+++ b/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__isolatch_lp D SLEEP_B KAPWR VGND VNB VPB VPWR Q
-M1000 VGND a_458_293# a_521_73# VNB nshort w=420000u l=150000u
-+  ad=5.95e+11p pd=6.54e+06u as=1.008e+11p ps=1.32e+06u
-M1001 a_117_535# D VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.814e+11p pd=2.18e+06u as=1.197e+11p ps=1.41e+06u
-M1002 a_837_93# SLEEP_B a_21_179# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1003 KAPWR a_458_293# a_410_419# VPB phighvt w=1e+06u l=250000u
-+  ad=8.8e+11p pd=7.4e+06u as=2.4e+11p ps=2.48e+06u
-M1004 Q a_281_535# KAPWR VPB phighvt w=1e+06u l=250000u
-+  ad=3.4e+11p pd=2.68e+06u as=0p ps=0u
-M1005 Q a_281_535# a_1284_177# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1006 KAPWR SLEEP_B a_21_179# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.56e+11p ps=2.08e+06u
-M1007 a_458_293# a_281_535# a_1009_93# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1008 a_281_535# a_36_73# a_232_125# VNB nshort w=420000u l=150000u
-+  ad=2.023e+11p pd=2.15e+06u as=1.008e+11p ps=1.32e+06u
-M1009 a_1284_177# a_281_535# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_232_125# D VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_410_419# a_36_73# a_281_535# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=3.312e+11p ps=2.79e+06u
-M1012 KAPWR a_281_535# a_458_293# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1013 a_419_73# a_21_179# a_281_535# VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1014 a_36_73# a_21_179# KAPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1015 a_521_73# a_458_293# a_419_73# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1009_93# a_281_535# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND SLEEP_B a_837_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_21_179# a_36_73# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1019 a_281_535# a_21_179# a_117_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_419_73# a_458_293# a_521_73# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_21_179# SLEEP_B a_837_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_281_535# a_21_179# a_419_73# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_117_535# a_21_179# a_281_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_837_93# SLEEP_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_232_125# a_36_73# a_281_535# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 KAPWR a_281_535# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_36_73# a_21_179# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR D a_117_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 KAPWR a_21_179# a_36_73# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 VGND D a_232_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_458_293# a_281_535# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 a_21_179# SLEEP_B KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 a_410_419# a_458_293# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X14 a_1284_177# a_281_535# Q VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_281_535# a_36_73# a_410_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X16 a_1009_93# a_281_535# a_458_293# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND a_281_535# a_1284_177# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_521_73# a_458_293# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VGND a_281_535# a_1009_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.cdl b/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.cdl
index ef81edb..d727adb 100644
--- a/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.cdl
+++ b/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.cdl
@@ -16,36 +16,36 @@
 
 .SUBCKT sky130_fd_sc_lp__lsbuf_lp A DESTPWR DESTVPB VGND VPB VPWR X
 *.PININFO A:I DESTPWR:I DESTVPB:I VGND:I VPB:I VPWR:I X:O
-MI2 cross2 cross1 DESTVPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MI2 cross2 cross1 DESTVPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI3 cross1 cross2 DESTVPB pfet_01v8_hvt m=1 w=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 sndP1a cross1 DESTVPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 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
+MI7 net56 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
-MI3 cross1 cross2 DESTVPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MI15 net40 cross2 DESTVPB pfet_01v8_hvt m=1 w=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 sndP2a cross2 DESTVPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 X cross2 DESTVPB pfet_01v8_hvt m=1 w=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 sndP1a cross1 DESTVPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MI5 cross1 Ab VGND nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI20 Ab A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI4 cross2 A VGND nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net56 A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net93 A VGND nfet_01v8 m=1 w=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 net40 cross2 DESTVPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MI16 net72 cross2 VGND nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI19 sndP2a cross2 DESTVPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MI23 Ab A VGND nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI21 net81 A VGND nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI22 net77 Ab VGND nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI24 X cross2 DESTVPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
+MI25 X cross2 VGND nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 cross1 Ab VGND nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI4 cross2 A VGND nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net93 A VGND nshort m=1 w=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 net72 cross2 VGND nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 Ab A VGND nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 net81 A VGND nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 net77 Ab VGND nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 X cross2 VGND nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__lsbuf_lp
diff --git a/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.netlist.tsv b/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.netlist.tsv
index a638de0..c6d393d 100644
--- a/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.netlist.tsv
+++ b/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.netlist.tsv
@@ -1,18 +1,18 @@
 sky130_fd_sc_lp__lsbuf_lp	A:I DESTPWR:I DESTVPB:I VGND:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI2	MOSFET	cross2	cross1	sndP1a	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	cross1	cross2	sndP2a	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	sndP1a	cross1	DESTPWR	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	Ab	A	net56	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net56	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	net40	cross2	DESTPWR	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	sndP2a	cross2	DESTPWR	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	X	cross2	net40	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	cross1	Ab	net77	VGND	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	cross2	A	net81	VGND	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net93	A	VGND	VGND	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net72	cross2	VGND	VGND	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	Ab	A	net93	VGND	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net81	A	VGND	VGND	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net77	Ab	VGND	VGND	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	X	cross2	net72	VGND	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	cross2	cross1	sndP1a	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	cross1	cross2	sndP2a	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	sndP1a	cross1	DESTPWR	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	Ab	A	net56	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net56	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	net40	cross2	DESTPWR	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	sndP2a	cross2	DESTPWR	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	X	cross2	net40	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	cross1	Ab	net77	VGND	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	cross2	A	net81	VGND	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net93	A	VGND	VGND	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net72	cross2	VGND	VGND	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	Ab	A	net93	VGND	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net81	A	VGND	VGND	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net77	Ab	VGND	VGND	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	X	cross2	net72	VGND	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.spice b/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.spice
index 25f031f..47f49ca 100644
--- a/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.spice
+++ b/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__lsbuf_lp A DESTPWR DESTVPB VGND VPB VPWR X
-M1000 a_712_718# a_193_718# VGND VGND nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=5.859e+11p ps=5.86e+06u
-M1001 a_278_47# A a_206_47# VPB phighvt w=1e+06u l=150000u
-+  ad=2.65e+11p pd=2.53e+06u as=2.1e+11p ps=2.42e+06u
-M1002 a_246_987# a_278_47# a_434_718# VGND nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=1.764e+11p ps=2.1e+06u
-M1003 X a_193_718# a_712_1085# DESTVPB phighvt w=1e+06u l=150000u
-+  ad=2.65e+11p pd=2.53e+06u as=2.1e+11p ps=2.42e+06u
-M1004 a_712_1085# a_193_718# DESTPWR DESTVPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=5.65e+11p ps=5.13e+06u
-M1005 VGND A a_276_718# VGND nshort w=840000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=2.1e+06u
-M1006 a_434_1085# a_193_718# DESTPWR DESTVPB phighvt w=1e+06u l=150000u
-+  ad=2.1e+11p pd=2.42e+06u as=0p ps=0u
-M1007 a_434_718# a_278_47# VGND VGND nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_278_47# A a_206_446# VGND nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1009 a_206_47# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1010 a_276_718# A a_193_718# VGND nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1011 a_206_446# A VGND VGND nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_246_987# a_193_718# a_434_1085# DESTVPB phighvt w=1e+06u l=150000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1013 X a_193_718# a_712_718# VGND nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1014 a_276_1085# a_246_987# a_193_718# DESTVPB phighvt w=1e+06u l=150000u
-+  ad=2.1e+11p pd=2.42e+06u as=2.65e+11p ps=2.53e+06u
-M1015 DESTPWR a_246_987# a_276_1085# DESTVPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_206_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 DESTPWR a_193_718# a_434_1085# DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 a_206_446# A a_278_47# VGND sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_276_718# A VGND VGND sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_434_1085# a_193_718# a_246_987# DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X5 a_206_47# A a_278_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X6 a_276_1085# a_246_987# DESTPWR DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 VGND A a_206_446# VGND sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_193_718# a_246_987# a_276_1085# DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X9 a_193_718# A a_276_718# VGND sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_712_718# a_193_718# X VGND sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VGND a_278_47# a_434_718# VGND sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_712_1085# a_193_718# X DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 DESTPWR a_193_718# a_712_1085# DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X14 VGND a_193_718# a_712_718# VGND sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_434_718# a_278_47# a_246_987# VGND sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.cdl b/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.cdl
index 9495082..ae119f2 100644
--- a/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.cdl
+++ b/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_lp__lsbufiso0p_lp A DESTPWR DESTVPB SLEEP VGND VPB VPWR X
 *.PININFO A:I DESTPWR:I DESTVPB:I SLEEP:I VGND:I VPB:I VPWR:I X:O
-MI2 cross2 cross1 DESTVPB 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
-MI3 cross1 cross2 DESTVPB 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 sndP1a cross1 DESTVPB 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
-MI20 Ab A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI2 cross2 cross1 DESTVPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI3 cross1 cross2 DESTVPB pfet_01v8_hvt m=1 w=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 sndP1a cross1 DESTVPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 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
-MI7 net80 A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net80 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
+MI15 net73 SLEEP DESTVPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 sleepb SLEEP DESTVPB pfet_01v8_hvt m=1 w=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 net68 SLEEP DESTVPB pfet_01v8_hvt m=1 w=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 sndP2a cross2 DESTVPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI29 net84 SLEEP DESTVPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 X cross2 DESTVPB pfet_01v8_hvt m=1 w=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 cross1 Ab VGND nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 cross2 A VGND nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 net73 SLEEP DESTVPB 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
-MI34 sleepb SLEEP DESTVPB 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 net68 SLEEP DESTVPB 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 sndP2a cross2 DESTVPB 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
-MI29 net84 SLEEP DESTVPB 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
-MI24 X cross2 DESTVPB 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
-MI5 cross1 Ab VGND nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net137 A VGND nfet_01v8 m=1 w=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 cross2 A VGND nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net137 A VGND nshort m=1 w=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 net100 cross2 VGND nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI16 net100 cross2 VGND nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net129 SLEEP VGND nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI36 net129 SLEEP VGND nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI35 sleepb SLEEP VGND nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI35 sleepb SLEEP VGND nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 Ab A VGND nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI23 Ab A VGND nfet_01v8 m=1 w=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 net108 SLEEP VGND nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI32 net108 SLEEP VGND nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 net113 A VGND nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI21 net113 A VGND nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 X SLEEP VGND nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI31 X SLEEP VGND nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 net105 Ab VGND nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 X cross2 VGND nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net112 sleepb VGND nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI22 net105 Ab VGND nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 X cross2 VGND nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net112 sleepb VGND nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__lsbufiso0p_lp
diff --git a/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.netlist.tsv b/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.netlist.tsv
index 1b40cd8..ed9d20f 100644
--- a/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.netlist.tsv
+++ b/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_lp__lsbufiso0p_lp	A:I DESTPWR:I DESTVPB:I SLEEP:I VGND:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI2	MOSFET	cross2	cross1	sndP1a	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	cross1	cross2	sndP2a	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	sndP1a	cross1	net84	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	Ab	A	net80	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net80	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	net73	SLEEP	DESTPWR	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	sleepb	SLEEP	net68	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net68	SLEEP	DESTPWR	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	sndP2a	cross2	net84	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	net84	SLEEP	DESTPWR	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	X	cross2	net73	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	cross1	Ab	net105	VGND	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	cross2	A	net113	VGND	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net137	A	VGND	VGND	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net100	cross2	VGND	VGND	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net129	SLEEP	VGND	VGND	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI35	MOSFET	sleepb	SLEEP	net129	VGND	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	Ab	A	net137	VGND	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	net108	SLEEP	VGND	VGND	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net113	A	net112	VGND	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	X	SLEEP	net108	VGND	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net105	Ab	net112	VGND	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	X	cross2	net100	VGND	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net112	sleepb	VGND	VGND	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	cross2	cross1	sndP1a	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	cross1	cross2	sndP2a	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	sndP1a	cross1	net84	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	Ab	A	net80	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net80	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	net73	SLEEP	DESTPWR	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	sleepb	SLEEP	net68	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net68	SLEEP	DESTPWR	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	sndP2a	cross2	net84	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	net84	SLEEP	DESTPWR	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	X	cross2	net73	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	cross1	Ab	net105	VGND	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	cross2	A	net113	VGND	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net137	A	VGND	VGND	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net100	cross2	VGND	VGND	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net129	SLEEP	VGND	VGND	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI35	MOSFET	sleepb	SLEEP	net129	VGND	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	Ab	A	net137	VGND	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	net108	SLEEP	VGND	VGND	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net113	A	net112	VGND	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	X	SLEEP	net108	VGND	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net105	Ab	net112	VGND	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	X	cross2	net100	VGND	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net112	sleepb	VGND	VGND	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.spice b/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.spice
index e27edee..fdc2b62 100644
--- a/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.spice
+++ b/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_lp__lsbufiso0p_lp A DESTPWR DESTVPB SLEEP VGND VPB VPWR X
-M1000 a_1096_1085# SLEEP DESTPWR DESTVPB phighvt w=1e+06u l=150000u
-+  ad=2.1e+11p pd=2.42e+06u as=5.65e+11p ps=5.13e+06u
-M1001 a_278_718# A a_206_718# VGND nshort w=840000u l=150000u
-+  ad=4.578e+11p pd=4.45e+06u as=1.764e+11p ps=2.1e+06u
-M1002 DESTPWR SLEEP a_278_1085# DESTVPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=5.5e+11p ps=5.1e+06u
-M1003 a_364_718# a_278_47# a_278_718# VGND nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1004 X a_123_718# a_1096_718# VGND nshort w=840000u l=150000u
-+  ad=4.494e+11p pd=4.43e+06u as=1.764e+11p ps=2.1e+06u
-M1005 a_789_1085# SLEEP DESTPWR DESTVPB phighvt w=1e+06u l=150000u
-+  ad=2.1e+11p pd=2.42e+06u as=0p ps=0u
-M1006 a_278_47# A a_206_47# VPB phighvt w=1e+06u l=150000u
-+  ad=2.65e+11p pd=2.53e+06u as=2.1e+11p ps=2.42e+06u
-M1007 a_938_718# SLEEP X VGND nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1008 a_206_718# A a_123_718# VGND nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1009 a_364_1085# a_123_718# a_278_1085# DESTVPB phighvt w=1e+06u l=150000u
-+  ad=2.1e+11p pd=2.42e+06u as=0p ps=0u
-M1010 a_176_987# a_123_718# a_364_1085# DESTVPB phighvt w=1e+06u l=150000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1011 a_1096_718# a_123_718# VGND VGND nshort w=840000u l=150000u
-+  ad=0p pd=0u as=6.972e+11p ps=7.23e+06u
-M1012 a_278_47# A a_206_446# VGND nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1013 a_206_47# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1014 VGND SLEEP a_938_718# VGND nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_517_420# SLEEP a_789_1085# DESTVPB phighvt w=1e+06u l=150000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1016 a_517_420# SLEEP a_631_802# VGND nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1017 a_206_446# A VGND VGND nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_631_802# SLEEP VGND VGND nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_278_1085# a_176_987# a_206_1085# DESTVPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.1e+11p ps=2.42e+06u
-M1020 a_206_1085# a_176_987# a_123_718# DESTVPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1021 a_176_987# a_278_47# a_364_718# VGND nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1022 VGND a_517_420# a_278_718# VGND nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_123_718# a_1096_1085# DESTVPB phighvt w=1e+06u l=150000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
+X0 a_206_1085# a_176_987# a_278_1085# DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 VPWR A a_206_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X2 a_123_718# a_176_987# a_206_1085# DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_1096_1085# a_123_718# X DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 VGND a_123_718# a_1096_718# VGND sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_278_718# a_517_420# VGND VGND sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 DESTPWR SLEEP a_1096_1085# DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_206_718# A a_278_718# VGND sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_364_718# a_278_47# a_176_987# VGND sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_278_1085# SLEEP DESTPWR DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_206_446# A a_278_47# VGND sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_123_718# A a_206_718# VGND sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_278_718# a_278_47# a_364_718# VGND sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_206_47# A a_278_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X14 VGND A a_206_446# VGND sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 DESTPWR SLEEP a_789_1085# DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 VGND SLEEP a_631_802# VGND sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_364_1085# a_123_718# a_176_987# DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X18 a_938_718# SLEEP VGND VGND sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 a_278_1085# a_123_718# a_364_1085# DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X20 X SLEEP a_938_718# VGND sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 a_1096_718# a_123_718# X VGND sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 a_631_802# SLEEP a_517_420# VGND sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_789_1085# SLEEP a_517_420# DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.cdl b/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.cdl
index 0c0c9ee..bc00cb2 100644
--- a/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.cdl
+++ b/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.cdl
@@ -16,52 +16,52 @@
 
 .SUBCKT sky130_fd_sc_lp__lsbufiso1p_lp A DESTPWR DESTVPB SLEEP VGND VPB VPWR X
 *.PININFO A:I DESTPWR:I DESTVPB:I SLEEP:I VGND:I VPB:I VPWR:I X:O
-MI2 cross2 cross1 DESTVPB 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
-MI3 cross1 cross2 DESTVPB 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 sndP1a cross1 DESTVPB 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
-MI20 Ab A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI2 cross2 cross1 DESTVPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI3 cross1 cross2 DESTVPB pfet_01v8_hvt m=1 w=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 sndP1a cross1 DESTVPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 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
-MI7 net89 A VPB phighvt m=1 w=1.0 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net89 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
+MI15 net82 cross2 DESTVPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI34 sleepb SLEEP DESTVPB pfet_01v8_hvt m=1 w=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 net77 SLEEP DESTVPB pfet_01v8_hvt m=1 w=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 sndP2a cross2 DESTVPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI39 net61 sleepb DESTVPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 X sleepb DESTVPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI29 net93 SLEEP DESTVPB pfet_01v8_hvt m=1 w=1.0 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI24 X cross2 DESTVPB pfet_01v8_hvt m=1 w=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 cross1 Ab VGND nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 cross2 A VGND nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI15 net82 cross2 DESTVPB 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
-MI34 sleepb SLEEP DESTVPB 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 net77 SLEEP DESTVPB 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 sndP2a cross2 DESTVPB 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
-MI39 net61 sleepb DESTVPB 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
-MI38 X sleepb DESTVPB 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
-MI29 net93 SLEEP DESTVPB 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
-MI24 X cross2 DESTVPB 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
-MI5 cross1 Ab VGND nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net138 A VGND nfet_01v8 m=1 w=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 cross2 A VGND nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net138 A VGND nshort m=1 w=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 net134 sleepb VGND nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI16 net134 sleepb VGND nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI36 net130 SLEEP VGND nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI36 net130 SLEEP VGND nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI35 sleepb SLEEP VGND nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI35 sleepb SLEEP VGND nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 Ab A VGND nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI23 Ab A VGND nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 net118 A VGND nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 net114 Ab VGND nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI25 X cross2 VGND nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI27 net117 sleepb VGND nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI21 net118 A VGND nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI22 net114 Ab VGND nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 X cross2 VGND nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net117 sleepb VGND nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__lsbufiso1p_lp
diff --git a/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.netlist.tsv b/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.netlist.tsv
index 786b6e6..14e5419 100644
--- a/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.netlist.tsv
+++ b/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.netlist.tsv
@@ -1,26 +1,26 @@
 sky130_fd_sc_lp__lsbufiso1p_lp	A:I DESTPWR:I DESTVPB:I SLEEP:I VGND:I VPB:I VPWR:I X:O
 Name	Formula	nd	ng	ns	nb	mname	m	w	l	mult	sa	sb	sd	topography	area	perim
-MI2	MOSFET	cross2	cross1	sndP1a	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	cross1	cross2	sndP2a	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	sndP1a	cross1	net93	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	Ab	A	net89	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net89	A	VPWR	VPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI15	MOSFET	net82	cross2	DESTPWR	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	sleepb	SLEEP	net77	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net77	SLEEP	DESTPWR	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	sndP2a	cross2	net93	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	net61	sleepb	DESTPWR	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	X	sleepb	net61	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	net93	SLEEP	DESTPWR	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	X	cross2	net82	DESTVPB	phighvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	cross1	Ab	net114	VGND	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	cross2	A	net118	VGND	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net138	A	VGND	VGND	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	net134	sleepb	VGND	VGND	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net130	SLEEP	VGND	VGND	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI35	MOSFET	sleepb	SLEEP	net130	VGND	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	Ab	A	net138	VGND	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net118	A	net117	VGND	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net114	Ab	net117	VGND	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	X	cross2	net134	VGND	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net117	sleepb	VGND	VGND	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	cross2	cross1	sndP1a	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	cross1	cross2	sndP2a	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	sndP1a	cross1	net93	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	Ab	A	net89	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net89	A	VPWR	VPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI15	MOSFET	net82	cross2	DESTPWR	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	sleepb	SLEEP	net77	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	net77	SLEEP	DESTPWR	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	sndP2a	cross2	net93	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	net61	sleepb	DESTPWR	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	X	sleepb	net61	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	net93	SLEEP	DESTPWR	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	X	cross2	net82	DESTVPB	pfet_01v8_hvt	1	1.0	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	cross1	Ab	net114	VGND	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	cross2	A	net118	VGND	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net138	A	VGND	VGND	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	net134	sleepb	VGND	VGND	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net130	SLEEP	VGND	VGND	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI35	MOSFET	sleepb	SLEEP	net130	VGND	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	Ab	A	net138	VGND	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net118	A	net117	VGND	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net114	Ab	net117	VGND	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	X	cross2	net134	VGND	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net117	sleepb	VGND	VGND	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.spice b/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.spice
index baceed0..b837178 100644
--- a/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.spice
+++ b/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_lp__lsbufiso1p_lp A DESTPWR DESTVPB SLEEP VGND VPB VPWR X
-M1000 a_278_718# A a_206_718# VGND nshort w=840000u l=150000u
-+  ad=4.578e+11p pd=4.45e+06u as=1.764e+11p ps=2.1e+06u
-M1001 a_364_718# a_278_47# a_278_718# VGND nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1002 a_717_1085# SLEEP DESTPWR DESTVPB phighvt w=1e+06u l=150000u
-+  ad=2.1e+11p pd=2.42e+06u as=5.6e+11p ps=5.12e+06u
-M1003 a_517_420# SLEEP a_717_1085# DESTVPB phighvt w=1e+06u l=150000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1004 a_278_47# A a_206_47# VPB phighvt w=1e+06u l=150000u
-+  ad=2.65e+11p pd=2.53e+06u as=2.1e+11p ps=2.42e+06u
-M1005 DESTPWR a_517_420# a_1033_1085# DESTVPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.1e+11p ps=2.42e+06u
-M1006 a_206_718# A a_123_718# VGND nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1007 a_364_1085# a_123_718# a_278_1085# DESTVPB phighvt w=1e+06u l=150000u
-+  ad=2.1e+11p pd=2.42e+06u as=5.5e+11p ps=5.1e+06u
-M1008 a_176_987# a_123_718# a_364_1085# DESTVPB phighvt w=1e+06u l=150000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1009 X a_123_718# a_1191_718# VGND nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=1.764e+11p ps=2.1e+06u
-M1010 a_278_47# A a_206_446# VGND nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1011 a_206_47# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1012 a_1191_718# a_517_420# VGND VGND nshort w=840000u l=150000u
-+  ad=0p pd=0u as=7.014e+11p ps=7.24e+06u
-M1013 a_517_420# SLEEP a_631_802# VGND nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1014 a_206_446# A VGND VGND nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 DESTPWR SLEEP a_278_1085# DESTVPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_123_718# a_1191_1085# DESTVPB phighvt w=1e+06u l=150000u
-+  ad=5.5e+11p pd=5.1e+06u as=2.1e+11p ps=2.42e+06u
-M1017 a_1191_1085# a_123_718# DESTPWR DESTVPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_631_802# SLEEP VGND VGND nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_278_1085# a_176_987# a_206_1085# DESTVPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.1e+11p ps=2.42e+06u
-M1020 a_206_1085# a_176_987# a_123_718# DESTVPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1021 a_1033_1085# a_517_420# X DESTVPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_176_987# a_278_47# a_364_718# VGND nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1023 VGND a_517_420# a_278_718# VGND nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_206_1085# a_176_987# a_278_1085# DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X1 a_1191_718# a_123_718# X VGND sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR A a_206_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X3 a_123_718# a_176_987# a_206_1085# DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X4 a_278_718# a_517_420# VGND VGND sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_206_718# A a_278_718# VGND sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_278_1085# SLEEP DESTPWR DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_364_718# a_278_47# a_176_987# VGND sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND a_517_420# a_1191_718# VGND sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_206_446# A a_278_47# VGND sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_123_718# A a_206_718# VGND sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_1191_1085# a_123_718# X DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 DESTPWR a_123_718# a_1191_1085# DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X13 a_278_718# a_278_47# a_364_718# VGND sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_206_47# A a_278_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X15 X a_517_420# a_1033_1085# DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 VGND A a_206_446# VGND sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_717_1085# SLEEP a_517_420# DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X18 DESTPWR SLEEP a_717_1085# DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X19 a_1033_1085# a_517_420# DESTPWR DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X20 VGND SLEEP a_631_802# VGND sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_364_1085# a_123_718# a_176_987# DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X22 a_278_1085# a_123_718# a_364_1085# DESTVPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X23 a_631_802# SLEEP a_517_420# VGND sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_0.cdl b/cells/maj3/sky130_fd_sc_lp__maj3_0.cdl
index 3817019..8fbe771 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_0.cdl
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_0.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__maj3_0 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN10 y B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN10 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN11 sndNBa A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN11 sndNBa 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
+MMN20 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN20 y B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN21 sndNBc 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
+MMN30 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN21 sndNBc C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN31 sndNCa 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 X y 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
-MMN30 y 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
-MMN31 sndNCa 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
-MMIP2 X y 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
-MMP10 VPWR 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
-MMP11 sndPAb 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
-MMP20 VPWR C VPB phighvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=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_lp__maj3_0
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_0.netlist.tsv b/cells/maj3/sky130_fd_sc_lp__maj3_0.netlist.tsv
index ce1095c..b6fc403 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_0.netlist.tsv
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_0.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__maj3_0	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN10	MOSFET	y	B	sndNBa	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN11	MOSFET	sndNBa	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN20	MOSFET	y	B	sndNBc	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN21	MOSFET	sndNBc	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN30	MOSFET	y	C	sndNCa	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN31	MOSFET	sndNCa	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP10	MOSFET	VPWR	A	sndPAb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP11	MOSFET	sndPAb	B	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP20	MOSFET	VPWR	C	sndPCb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP21	MOSFET	sndPCb	B	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP30	MOSFET	VPWR	A	sndPAc	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP31	MOSFET	sndPAc	C	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN10	MOSFET	y	B	sndNBa	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN11	MOSFET	sndNBa	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN20	MOSFET	y	B	sndNBc	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN21	MOSFET	sndNBc	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN30	MOSFET	y	C	sndNCa	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN31	MOSFET	sndNCa	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP10	MOSFET	VPWR	A	sndPAb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP11	MOSFET	sndPAb	B	y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP20	MOSFET	VPWR	C	sndPCb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP21	MOSFET	sndPCb	B	y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP30	MOSFET	VPWR	A	sndPAc	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP31	MOSFET	sndPAc	C	y	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/maj3/sky130_fd_sc_lp__maj3_0.spice b/cells/maj3/sky130_fd_sc_lp__maj3_0.spice
index 38feab9..86fada0 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_0.spice
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_0.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__maj3_0 A B C VGND VNB VPB VPWR X
-M1000 a_149_57# C a_28_431# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.373e+11p ps=2.81e+06u
-M1001 a_313_57# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.352e+11p ps=2.8e+06u
-M1002 a_28_431# B a_313_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_28_431# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1004 a_477_431# B a_28_431# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.373e+11p ps=2.81e+06u
-M1005 VPWR C a_477_431# VPB phighvt w=420000u l=150000u
-+  ad=4.449e+11p pd=3.94e+06u as=0p ps=0u
-M1006 a_28_431# B a_319_431# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1007 a_477_57# B a_28_431# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1008 a_319_431# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_28_431# VPWR VPB phighvt w=640000u l=150000u
-+  ad=2.56e+11p pd=2.08e+06u as=0p ps=0u
-M1010 VGND A a_149_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND C a_477_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A a_115_431# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1013 a_115_431# C a_28_431# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_477_57# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND a_28_431# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_313_57# B a_28_431# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR A a_319_431# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_28_431# C a_149_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_28_431# B a_477_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_149_57# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_28_431# B a_477_431# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_477_431# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_319_431# B a_28_431# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 VPWR a_28_431# X VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 VGND A a_313_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_115_431# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 a_28_431# C a_115_431# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_1.cdl b/cells/maj3/sky130_fd_sc_lp__maj3_1.cdl
index e2f9b19..656e7d9 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_1.cdl
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_1.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN10 y B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN10 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN11 sndNBa A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN11 sndNBa 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
+MMN20 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN20 y B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN21 sndNBc 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
+MMN30 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN21 sndNBc C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN31 sndNCa 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 X y VPB pfet_01v8_hvt m=1 w=1.26 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=1 w=1.26 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=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_lp__maj3_1
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_1.netlist.tsv b/cells/maj3/sky130_fd_sc_lp__maj3_1.netlist.tsv
index 540a49b..8f5e897 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_1.netlist.tsv
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_1.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN10	MOSFET	y	B	sndNBa	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN11	MOSFET	sndNBa	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN20	MOSFET	y	B	sndNBc	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN21	MOSFET	sndNBc	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN30	MOSFET	y	C	sndNCa	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN31	MOSFET	sndNCa	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP10	MOSFET	VPWR	A	sndPAb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP11	MOSFET	sndPAb	B	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP20	MOSFET	VPWR	C	sndPCb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP21	MOSFET	sndPCb	B	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP30	MOSFET	VPWR	A	sndPAc	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP31	MOSFET	sndPAc	C	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN10	MOSFET	y	B	sndNBa	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN11	MOSFET	sndNBa	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN20	MOSFET	y	B	sndNBc	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN21	MOSFET	sndNBc	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN30	MOSFET	y	C	sndNCa	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN31	MOSFET	sndNCa	A	VGND	VNB	nfet_01v8	1	0.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP10	MOSFET	VPWR	A	sndPAb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP11	MOSFET	sndPAb	B	y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP20	MOSFET	VPWR	C	sndPCb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP21	MOSFET	sndPCb	B	y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP30	MOSFET	VPWR	A	sndPAc	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP31	MOSFET	sndPAc	C	y	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/maj3/sky130_fd_sc_lp__maj3_1.spice b/cells/maj3/sky130_fd_sc_lp__maj3_1.spice
index 73f7379..4e7d603 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_1.spice
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_1.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__maj3_1 A B C VGND VNB VPB VPWR X
-M1000 a_30_57# B a_275_391# VPB phighvt w=420000u l=150000u
-+  ad=3.368e+11p pd=3.29e+06u as=8.82e+10p ps=1.26e+06u
-M1001 a_479_57# B a_30_57# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.373e+11p ps=2.81e+06u
-M1002 VPWR A a_117_391# VPB phighvt w=420000u l=150000u
-+  ad=5.733e+11p pd=4.95e+06u as=8.82e+10p ps=1.26e+06u
-M1003 VGND A a_117_57# VNB nshort w=420000u l=150000u
-+  ad=4.914e+11p pd=4.13e+06u as=1.512e+11p ps=1.56e+06u
-M1004 a_117_57# C a_30_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_117_391# C a_30_57# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_315_57# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1007 a_30_57# B a_315_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_479_389# B a_30_57# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1009 VPWR C a_479_389# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_30_57# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1011 X a_30_57# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1012 VGND C a_479_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_275_391# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_275_391# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_275_391# B a_30_57# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_30_57# B a_479_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND A a_315_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_117_57# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_30_57# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_30_57# B a_479_389# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_479_57# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_30_57# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_117_391# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_479_389# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_315_57# B a_30_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_30_57# C a_117_391# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 a_30_57# C a_117_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_2.cdl b/cells/maj3/sky130_fd_sc_lp__maj3_2.cdl
index 284a7ee..45487fe 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_2.cdl
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_2.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 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
-MMN10 y B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN10 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN11 sndNBa A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN11 sndNBa 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
+MMN20 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN20 y B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN21 sndNBc 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
+MMN30 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN21 sndNBc C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN31 sndNCa 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 X y VPB pfet_01v8_hvt m=2 w=1.26 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=2 w=1.26 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=0.64 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=0.64 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=0.64 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=0.64 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=0.64 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=0.64 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=0.64 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=0.64 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=0.64 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=0.64 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=0.64 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=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_lp__maj3_2
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_2.netlist.tsv b/cells/maj3/sky130_fd_sc_lp__maj3_2.netlist.tsv
index 2fd7cc8..896474b 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_2.netlist.tsv
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_2.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN10	MOSFET	y	B	sndNBa	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN11	MOSFET	sndNBa	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN20	MOSFET	y	B	sndNBc	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN21	MOSFET	sndNBc	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN30	MOSFET	y	C	sndNCa	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN31	MOSFET	sndNCa	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP10	MOSFET	VPWR	A	sndPAb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP11	MOSFET	sndPAb	B	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP20	MOSFET	VPWR	C	sndPCb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP21	MOSFET	sndPCb	B	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP30	MOSFET	VPWR	A	sndPAc	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP31	MOSFET	sndPAc	C	y	VPB	phighvt	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN10	MOSFET	y	B	sndNBa	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN11	MOSFET	sndNBa	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN20	MOSFET	y	B	sndNBc	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN21	MOSFET	sndNBc	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN30	MOSFET	y	C	sndNCa	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN31	MOSFET	sndNCa	A	VGND	VNB	nfet_01v8	1	0.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP10	MOSFET	VPWR	A	sndPAb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP11	MOSFET	sndPAb	B	y	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP20	MOSFET	VPWR	C	sndPCb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP21	MOSFET	sndPCb	B	y	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP30	MOSFET	VPWR	A	sndPAc	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP31	MOSFET	sndPAc	C	y	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/maj3/sky130_fd_sc_lp__maj3_2.spice b/cells/maj3/sky130_fd_sc_lp__maj3_2.spice
index de353b2..fa9d71e 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_2.spice
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__maj3_2 A B C VGND VNB VPB VPWR X
-M1000 a_310_491# A VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.0517e+12p ps=8.57e+06u
-M1001 X a_59_491# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=7.476e+11p ps=6.37e+06u
-M1002 a_154_49# C a_59_491# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.373e+11p ps=2.81e+06u
-M1003 VGND A a_154_49# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_474_491# B a_59_491# VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=3.616e+11p ps=3.69e+06u
-M1005 VPWR a_59_491# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1006 a_318_49# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1007 a_59_491# B a_318_49# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_146_491# C a_59_491# VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1009 VPWR A a_146_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_59_491# B a_310_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR C a_474_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_59_491# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_59_491# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_482_49# B a_59_491# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1015 VGND C a_482_49# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_310_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_59_491# C a_154_49# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_318_49# B a_59_491# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_59_491# B a_482_49# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 X a_59_491# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_474_491# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 VPWR a_59_491# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_310_491# B a_59_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 VGND A a_318_49# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 X a_59_491# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_59_491# B a_474_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 a_59_491# C a_146_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 a_154_49# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_146_491# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 a_482_49# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VGND a_59_491# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_4.cdl b/cells/maj3/sky130_fd_sc_lp__maj3_4.cdl
index c8312d0..10df206 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_4.cdl
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_4.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=4 w=0.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN10 y B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN11 sndNBa A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN11 sndNBa A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN20 y B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN20 y B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN21 sndNBc C VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN30 y C VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN21 sndNBc C VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN31 sndNCa A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=4 w=1.26 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.84 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.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 phighvt m=4 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__maj3_4
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_4.netlist.tsv b/cells/maj3/sky130_fd_sc_lp__maj3_4.netlist.tsv
index bdb3c65..d9719cf 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_4.netlist.tsv
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_4.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN10	MOSFET	y	B	sndNBa	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN11	MOSFET	sndNBa	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN20	MOSFET	y	B	sndNBc	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN21	MOSFET	sndNBc	C	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN30	MOSFET	y	C	sndNCa	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN31	MOSFET	sndNCa	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP10	MOSFET	VPWR	A	sndPAb	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP11	MOSFET	sndPAb	B	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP20	MOSFET	VPWR	C	sndPCb	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP21	MOSFET	sndPCb	B	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP30	MOSFET	VPWR	A	sndPAc	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP31	MOSFET	sndPAc	C	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN10	MOSFET	y	B	sndNBa	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN11	MOSFET	sndNBa	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN20	MOSFET	y	B	sndNBc	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN21	MOSFET	sndNBc	C	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN30	MOSFET	y	C	sndNCa	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN31	MOSFET	sndNCa	A	VGND	VNB	nfet_01v8	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	4	1.26	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_4.spice b/cells/maj3/sky130_fd_sc_lp__maj3_4.spice
index f3ff9c2..7f4d40e 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_4.spice
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_4.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__maj3_4 A B C VGND VNB VPB VPWR X
-M1000 VPWR A a_154_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7955e+12p pd=1.293e+07u as=3.024e+11p ps=3e+06u
-M1001 VGND A a_154_47# VNB nshort w=840000u l=150000u
-+  ad=1.197e+12p pd=9.57e+06u as=2.016e+11p ps=2.16e+06u
-M1002 a_154_47# C a_65_367# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.746e+11p ps=4.49e+06u
-M1003 VGND a_65_367# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=5.04e+11p ps=4.56e+06u
-M1004 VGND a_65_367# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_65_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_65_367# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1007 VPWR a_65_367# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_318_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.024e+11p pd=3e+06u as=0p ps=0u
-M1009 a_482_367# B a_65_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.024e+11p pd=3e+06u as=7.245e+11p ps=6.19e+06u
-M1010 a_318_47# A VGND VNB nshort w=840000u l=150000u
-+  ad=2.016e+11p pd=2.16e+06u as=0p ps=0u
-M1011 a_65_367# B a_318_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_65_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_65_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_154_367# C a_65_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_65_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND C a_482_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.016e+11p ps=2.16e+06u
-M1017 a_482_47# B a_65_367# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_65_367# B a_318_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR C a_482_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_65_367# C a_154_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR A a_318_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_65_367# C a_154_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_318_47# B a_65_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_65_367# B a_482_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPWR a_65_367# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 X a_65_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_482_367# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND A a_318_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_154_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 X a_65_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VGND a_65_367# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_318_367# B a_65_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 VGND a_65_367# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 VPWR a_65_367# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_154_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_482_47# C VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_65_367# B a_482_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 X a_65_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 X a_65_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_lp.cdl b/cells/maj3/sky130_fd_sc_lp__maj3_lp.cdl
index 8759aa3..61f0818 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_lp.cdl
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_lp.cdl
@@ -16,34 +16,34 @@
 
 .SUBCKT sky130_fd_sc_lp__maj3_lp 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN10 y B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN10 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN11 sndNBa A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN11 sndNBa 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
+MMN20 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN20 y B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN21 sndNBc 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
+MMN30 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN21 sndNBc C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN31 sndNCa 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 net64 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN30 y C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 X y 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
-MMN31 sndNCa A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP10 VPWR A 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
-MI6 net64 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP11 sndPAb B 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
+MMP20 VPWR C 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 y 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
-MMP10 VPWR A VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP21 sndPCb B 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
+MMP30 VPWR A 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
-MMP11 sndPAb B 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
-MMP20 VPWR C 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
-MMP21 sndPCb B 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
-MMP30 VPWR A 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
-MMP31 sndPAc C 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
+MMP31 sndPAc C 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_lp__maj3_lp
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_lp.netlist.tsv b/cells/maj3/sky130_fd_sc_lp__maj3_lp.netlist.tsv
index c3cad06..7a2b49a 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_lp.netlist.tsv
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_lp.netlist.tsv
@@ -1,17 +1,17 @@
 sky130_fd_sc_lp__maj3_lp	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	net64	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN10	MOSFET	y	B	sndNBa	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN11	MOSFET	sndNBa	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN20	MOSFET	y	B	sndNBc	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN21	MOSFET	sndNBc	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN30	MOSFET	y	C	sndNCa	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN31	MOSFET	sndNCa	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net64	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP10	MOSFET	VPWR	A	sndPAb	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP11	MOSFET	sndPAb	B	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP20	MOSFET	VPWR	C	sndPCb	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP21	MOSFET	sndPCb	B	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP30	MOSFET	VPWR	A	sndPAc	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP31	MOSFET	sndPAc	C	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	net64	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN10	MOSFET	y	B	sndNBa	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN11	MOSFET	sndNBa	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN20	MOSFET	y	B	sndNBc	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN21	MOSFET	sndNBc	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN30	MOSFET	y	C	sndNCa	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN31	MOSFET	sndNCa	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net64	y	VGND	VNB	nfet_01v8	1	0.42	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP10	MOSFET	VPWR	A	sndPAb	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP11	MOSFET	sndPAb	B	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP20	MOSFET	VPWR	C	sndPCb	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP21	MOSFET	sndPCb	B	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP30	MOSFET	VPWR	A	sndPAc	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP31	MOSFET	sndPAc	C	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_lp.spice b/cells/maj3/sky130_fd_sc_lp__maj3_lp.spice
index 0689412..ee54cd0 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_lp.spice
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_lp.spice
@@ -16,34 +16,19 @@
 
 
 .subckt sky130_fd_sc_lp__maj3_lp A B C VGND VNB VPB VPWR X
-M1000 a_154_125# B a_29_419# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.20775e+11p ps=3.54e+06u
-M1001 VGND C a_530_68# VNB nshort w=420000u l=150000u
-+  ad=3.8505e+11p pd=3.69e+06u as=1.302e+11p ps=1.46e+06u
-M1002 a_548_419# B a_29_419# VPB phighvt w=1e+06u l=250000u
-+  ad=2.5e+11p pd=2.5e+06u as=6.45e+11p ps=5.29e+06u
-M1003 X a_29_419# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=5.7e+11p ps=5.14e+06u
-M1004 a_152_419# B a_29_419# VPB phighvt w=1e+06u l=250000u
-+  ad=2.1e+11p pd=2.42e+06u as=0p ps=0u
-M1005 VPWR C a_548_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_29_419# C a_350_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1007 X a_29_419# a_708_68# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1008 a_29_419# C a_350_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.1e+11p ps=2.42e+06u
-M1009 a_708_68# a_29_419# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A a_154_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_530_68# B a_29_419# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_350_419# A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A a_152_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_350_125# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_548_419# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_530_68# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR A a_350_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_350_419# C a_29_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_29_419# B a_154_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_29_419# B a_530_68# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_29_419# a_708_68# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_29_419# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 VGND A a_350_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_154_125# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_350_125# C a_29_419# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_29_419# B a_548_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 a_708_68# a_29_419# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_29_419# B a_152_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X14 a_152_419# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_m.cdl b/cells/maj3/sky130_fd_sc_lp__maj3_m.cdl
index daba023..534602f 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_m.cdl
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_m.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__maj3_m 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN10 y B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN10 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN11 sndNBa A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN11 sndNBa 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
+MMN20 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN20 y B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN21 sndNBc 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
+MMN30 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN21 sndNBc C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN31 sndNCa 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 X y VPB pfet_01v8_hvt m=1 w=0.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=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_lp__maj3_m
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_m.netlist.tsv b/cells/maj3/sky130_fd_sc_lp__maj3_m.netlist.tsv
index 415bf2a..f812348 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_m.netlist.tsv
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_m.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__maj3_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN10	MOSFET	y	B	sndNBa	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN11	MOSFET	sndNBa	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN20	MOSFET	y	B	sndNBc	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN21	MOSFET	sndNBc	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN30	MOSFET	y	C	sndNCa	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN31	MOSFET	sndNCa	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP10	MOSFET	VPWR	A	sndPAb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP11	MOSFET	sndPAb	B	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP20	MOSFET	VPWR	C	sndPCb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP21	MOSFET	sndPCb	B	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP30	MOSFET	VPWR	A	sndPAc	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP31	MOSFET	sndPAc	C	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN10	MOSFET	y	B	sndNBa	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN11	MOSFET	sndNBa	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN20	MOSFET	y	B	sndNBc	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN21	MOSFET	sndNBc	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN30	MOSFET	y	C	sndNCa	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN31	MOSFET	sndNCa	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP10	MOSFET	VPWR	A	sndPAb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP11	MOSFET	sndPAb	B	y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP20	MOSFET	VPWR	C	sndPCb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP21	MOSFET	sndPCb	B	y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP30	MOSFET	VPWR	A	sndPAc	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP31	MOSFET	sndPAc	C	y	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/maj3/sky130_fd_sc_lp__maj3_m.spice b/cells/maj3/sky130_fd_sc_lp__maj3_m.spice
index 856d573..6dc5996 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_m.spice
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_m.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__maj3_m A B C VGND VNB VPB VPWR X
-M1000 a_121_57# C a_34_57# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.373e+11p ps=2.81e+06u
-M1001 X a_34_57# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=3.843e+11p ps=3.51e+06u
-M1002 a_285_425# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1003 a_121_425# C a_34_57# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.373e+11p ps=2.81e+06u
-M1004 a_34_57# B a_285_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1005 a_449_425# B a_34_57# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1006 VPWR C a_449_425# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_285_57# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.507e+11p ps=3.35e+06u
-M1008 VGND C a_449_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1009 X a_34_57# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1010 VPWR A a_121_425# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_34_57# B a_285_425# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_449_57# B a_34_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A a_121_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_34_57# C a_121_425# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_285_425# B a_34_57# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_34_57# B a_449_425# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_449_425# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_121_425# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_285_57# B a_34_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_34_57# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_34_57# C a_121_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR A a_285_425# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_34_57# B a_449_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_121_57# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND A a_285_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_449_57# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VGND a_34_57# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_0.cdl b/cells/mux2/sky130_fd_sc_lp__mux2_0.cdl
index f15cb92..6708ac2 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_0.cdl
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_0.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__mux2_0 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 xb A0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VNB nfet_01v8 m=1 w=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 Sb S VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA10 xb A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X xb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA11 sndNA1 S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Sb S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X xb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=0.42 l=0.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=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_lp__mux2_0
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_0.netlist.tsv b/cells/mux2/sky130_fd_sc_lp__mux2_0.netlist.tsv
index f072a71..51dde70 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_0.netlist.tsv
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_0.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__mux2_0	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	xb	A1	sndNA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	xb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	xb	A0	smdNA0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	xb	A1	sndNA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	xb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	xb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	xb	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	xb	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/mux2/sky130_fd_sc_lp__mux2_0.spice b/cells/mux2/sky130_fd_sc_lp__mux2_0.spice
index bb6ac9d..2f6cd0d 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_0.spice
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_0.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__mux2_0 A0 A1 S VGND VNB VPB VPWR X
-M1000 a_509_99# S VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=4.132e+11p ps=3.81e+06u
-M1001 VPWR a_89_200# X VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1002 a_227_491# S VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1003 a_467_125# A0 a_89_200# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.638e+11p ps=1.62e+06u
-M1004 a_257_94# S VGND VNB nshort w=420000u l=150000u
-+  ad=1.729e+11p pd=1.87e+06u as=3.234e+11p ps=3.22e+06u
-M1005 a_89_200# A0 a_227_491# VPB phighvt w=420000u l=150000u
-+  ad=2.274e+11p pd=2.02e+06u as=0p ps=0u
-M1006 a_423_515# A1 a_89_200# VPB phighvt w=420000u l=150000u
-+  ad=2.1e+11p pd=1.84e+06u as=0p ps=0u
-M1007 a_509_99# S VGND VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1008 a_89_200# A1 a_257_94# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_89_200# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1010 VGND a_509_99# a_467_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_509_99# a_423_515# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_89_200# A0 a_467_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_89_200# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 X a_89_200# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 VPWR S a_509_99# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VGND S a_257_94# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_89_200# A1 a_423_515# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_423_515# a_509_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_257_94# A1 a_89_200# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_467_125# a_509_99# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR S a_227_491# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_227_491# A0 a_89_200# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 VGND S a_509_99# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_1.cdl b/cells/mux2/sky130_fd_sc_lp__mux2_1.cdl
index 61e417f..0af37ce 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_1.cdl
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 xb A0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VNB nfet_01v8 m=1 w=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 Sb S VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA10 xb A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X xb VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA11 sndNA1 S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Sb S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X xb VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=0.42 l=0.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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__mux2_1
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_1.netlist.tsv b/cells/mux2/sky130_fd_sc_lp__mux2_1.netlist.tsv
index 14b5100..c56f2e4 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_1.netlist.tsv
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	xb	A1	sndNA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	xb	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	xb	A0	smdNA0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	xb	A1	sndNA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	xb	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	xb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	xb	VPB	pfet_01v8_hvt	1	0.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_1.spice b/cells/mux2/sky130_fd_sc_lp__mux2_1.spice
index 7aa46c0..c7b4ef9 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_1.spice
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__mux2_1 A0 A1 S VGND VNB VPB VPWR X
-M1000 VPWR a_488_106# a_518_434# VPB phighvt w=420000u l=150000u
-+  ad=6.447e+11p pd=5.37e+06u as=1.638e+11p ps=1.62e+06u
-M1001 a_105_22# A1 a_266_132# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.344e+11p ps=1.48e+06u
-M1002 VGND a_105_22# X VNB nshort w=840000u l=150000u
-+  ad=7.14e+11p pd=5.39e+06u as=2.226e+11p ps=2.21e+06u
-M1003 a_488_106# S VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1004 a_288_434# S VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1005 a_105_22# A0 a_288_434# VPB phighvt w=420000u l=150000u
-+  ad=2.688e+11p pd=2.12e+06u as=0p ps=0u
-M1006 VPWR a_105_22# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1007 a_266_132# S VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_488_106# a_446_132# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1009 a_518_434# A1 a_105_22# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_446_132# A0 a_105_22# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_488_106# S VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 VGND S a_266_132# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_518_434# a_488_106# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_105_22# A0 a_446_132# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_105_22# A1 a_518_434# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_266_132# A1 a_105_22# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_105_22# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VPWR S a_288_434# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND S a_488_106# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_446_132# a_488_106# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR S a_488_106# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 X a_105_22# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_288_434# A0 a_105_22# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_2.cdl b/cells/mux2/sky130_fd_sc_lp__mux2_2.cdl
index 0e4565d..d215746 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_2.cdl
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 xb A0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nshort 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
-MMPA00 VPWR S 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
-MMPA01 sndPS A0 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
-MMPA10 VPWR Sb 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
-MMPA11 sndPSb A1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VNB nfet_01v8 m=1 w=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 Sb S VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA10 xb A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X xb VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA11 sndNA1 S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Sb S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X xb VNB nfet_01v8 m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=0.64 l=0.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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__mux2_2
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_2.netlist.tsv b/cells/mux2/sky130_fd_sc_lp__mux2_2.netlist.tsv
index 9d29136..1a06809 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_2.netlist.tsv
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	xb	A1	sndNA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	xb	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	xb	A0	smdNA0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	xb	A1	sndNA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	xb	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	xb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	xb	VPB	pfet_01v8_hvt	1	0.64	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_2.spice b/cells/mux2/sky130_fd_sc_lp__mux2_2.spice
index 61bdc5f..c905bd4 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_2.spice
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__mux2_2 A0 A1 S VGND VNB VPB VPWR X
-M1000 a_350_449# a_284_279# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=1.05375e+12p ps=8.59e+06u
-M1001 a_319_48# a_284_279# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=7.269e+11p ps=6.53e+06u
-M1002 VPWR S a_508_449# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.048e+11p ps=1.92e+06u
-M1003 VGND S a_499_48# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1004 a_508_449# A0 a_86_21# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1005 a_499_48# A1 a_86_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.638e+11p ps=1.62e+06u
-M1006 X a_86_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1007 X a_86_21# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1008 VGND a_86_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_284_279# S VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1010 a_86_21# A1 a_350_449# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_86_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_284_279# S VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1013 a_86_21# A0 a_319_48# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND S a_284_279# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_319_48# A0 a_86_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR S a_284_279# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_508_449# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 a_86_21# A0 a_508_449# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_350_449# A1 a_86_21# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 a_86_21# A1 a_499_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_86_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VPWR a_86_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VGND a_284_279# a_319_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VPWR a_284_279# a_350_449# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 X a_86_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 X a_86_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_499_48# S VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_4.cdl b/cells/mux2/sky130_fd_sc_lp__mux2_4.cdl
index 7ee2a55..f4bf8a4 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_4.cdl
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 xb A0 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nshort m=4 w=0.84 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA10 xb A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X xb VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA11 sndNA1 S VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Sb S VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X xb VNB nfet_01v8 m=4 w=0.84 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__mux2_4
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_4.netlist.tsv b/cells/mux2/sky130_fd_sc_lp__mux2_4.netlist.tsv
index 2b76415..6e401bd 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_4.netlist.tsv
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	xb	A1	sndNA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	xb	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	xb	A0	smdNA0	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	xb	A1	sndNA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	xb	VGND	VNB	nfet_01v8	4	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_4.spice b/cells/mux2/sky130_fd_sc_lp__mux2_4.spice
index 9dc5bb4..61f8d10 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_4.spice
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_lp__mux2_4 A0 A1 S VGND VNB VPB VPWR X
-M1000 VGND a_359_47# X VNB nshort w=840000u l=150000u
-+  ad=1.3818e+12p pd=1.001e+07u as=4.704e+11p ps=4.48e+06u
-M1001 X a_359_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_210_367# A1 a_359_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.678e+11p pd=6.1e+06u as=3.528e+11p ps=3.08e+06u
-M1003 X a_359_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=1.3923e+12p ps=1.229e+07u
-M1004 VGND S a_508_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=2.1e+06u
-M1005 a_359_47# A0 a_317_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=6.678e+11p ps=6.1e+06u
-M1006 X a_359_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND S a_41_367# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1008 a_287_47# a_41_367# VGND VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1009 VPWR S a_317_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_359_47# A0 a_287_47# VNB nshort w=840000u l=150000u
-+  ad=4.998e+11p pd=2.87e+06u as=0p ps=0u
-M1011 a_508_47# A1 a_359_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_359_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR S a_41_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1014 VGND a_359_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_359_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR a_359_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_210_367# a_41_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_359_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_287_47# A0 a_359_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 X a_359_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VPWR a_359_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 X a_359_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_359_47# A1 a_508_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_359_47# A1 a_210_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_317_367# A0 a_359_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND a_359_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 X a_359_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VPWR a_359_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_41_367# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VGND a_41_367# a_287_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VPWR a_41_367# a_210_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_508_47# S VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_41_367# S VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 VGND a_359_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_317_367# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_8.cdl b/cells/mux2/sky130_fd_sc_lp__mux2_8.cdl
index 4c37969..c2e80a2 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_8.cdl
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_8.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__mux2_8 A0 A1 S VGND VNB VPB VPWR X
 *.PININFO A0:I A1:I S:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNA00 xb A0 VNB 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.84 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=8 w=0.84 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.84 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=8 w=0.84 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.26 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=8 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB pfet_01v8_hvt m=2 w=1.0 l=0.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.26 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=8 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__mux2_8
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_8.netlist.tsv b/cells/mux2/sky130_fd_sc_lp__mux2_8.netlist.tsv
index 2f57857..d4e0ebd 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_8.netlist.tsv
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_8.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__mux2_8	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	xb	VGND	VNB	nshort	8	0.84	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	phighvt	8	1.26	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	xb	VGND	VNB	nfet_01v8	8	0.84	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	xb	VPWR	VPB	pfet_01v8_hvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_8.spice b/cells/mux2/sky130_fd_sc_lp__mux2_8.spice
index 4e07c09..d8395a7 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_8.spice
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_8.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_lp__mux2_8 A0 A1 S VGND VNB VPB VPWR X
-M1000 a_1179_311# S VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=2.8657e+12p ps=2.197e+07u
-M1001 VGND a_1179_311# a_1243_47# VNB nshort w=640000u l=150000u
-+  ad=1.9725e+12p pd=1.641e+07u as=4.032e+11p ps=3.82e+06u
-M1002 a_843_419# A0 a_84_21# VPB phighvt w=1e+06u l=150000u
-+  ad=7e+11p pd=5.4e+06u as=6.3e+11p ps=5.26e+06u
-M1003 VPWR a_1179_311# a_1243_419# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=6.4e+11p ps=5.28e+06u
-M1004 VGND a_84_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=9.408e+11p ps=8.96e+06u
-M1005 VGND a_84_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_84_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=0p ps=0u
-M1007 VPWR S a_843_419# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_1243_47# A0 a_84_21# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=4.032e+11p ps=3.82e+06u
-M1009 VGND a_84_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND S a_839_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=4.032e+11p ps=3.82e+06u
-M1011 X a_84_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_84_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1243_419# a_1179_311# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_84_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_84_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_839_47# A1 a_84_21# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_84_21# A1 a_1243_419# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_839_47# S VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_84_21# A1 a_839_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1243_47# a_1179_311# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_84_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_84_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_843_419# S VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_84_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X a_84_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1243_419# A1 a_84_21# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 X a_84_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_84_21# A0 a_843_419# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_84_21# A0 a_1243_47# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1179_311# S VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1031 VPWR a_84_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 X a_84_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 X a_84_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_84_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 X a_84_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VGND S a_1179_311# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VGND a_84_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_1243_47# a_1179_311# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 X a_84_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VPWR S a_1179_311# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_839_47# S VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 a_839_47# A1 a_84_21# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 VPWR S a_843_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X10 a_1243_419# A1 a_84_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 a_1243_47# A0 a_84_21# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_84_21# A0 a_1243_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 X a_84_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 VPWR a_84_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_843_419# A0 a_84_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X16 VPWR a_84_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_84_21# A1 a_1243_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X18 VGND a_1179_311# a_1243_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 X a_84_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 VPWR a_84_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 a_1243_419# a_1179_311# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X22 VGND a_84_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 X a_84_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 VGND a_84_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 X a_84_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 VGND S a_839_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X27 VPWR a_1179_311# a_1243_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X28 VPWR a_84_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 X a_84_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 a_843_419# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X31 X a_84_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X32 a_84_21# A1 a_839_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X33 a_84_21# A0 a_843_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
 .ends
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_lp.cdl b/cells/mux2/sky130_fd_sc_lp__mux2_lp.cdl
index 87d17e6..78aa5d5 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_lp.cdl
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_lp.cdl
@@ -16,36 +16,36 @@
 
 .SUBCKT sky130_fd_sc_lp__mux2_lp 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
-MI6 Sb S VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA00 xb A0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 Sb S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 xb A0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nshort m=1 w=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 net36 S VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net29 xb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VNB nfet_01v8 m=1 w=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 net64 S VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA10 xb A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X xb VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA11 sndNA1 S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 net36 S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net61 xb VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X xb VNB nfet_01v8 m=1 w=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 Sb S VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net29 xb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net64 S VPB pfet_01v8_hvt m=1 w=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 xb VPB pfet_01v8_hvt m=1 w=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 net61 xb VPB pfet_01v8_hvt m=1 w=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 Sb S VPB pfet_01v8_hvt m=1 w=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_lp__mux2_lp
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_lp.netlist.tsv b/cells/mux2/sky130_fd_sc_lp__mux2_lp.netlist.tsv
index 7cf76d2..4415d78 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_lp.netlist.tsv
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_lp.netlist.tsv
@@ -1,18 +1,18 @@
 sky130_fd_sc_lp__mux2_lp	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
-MI6	MOSFET	Sb	S	net36	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA00	MOSFET	xb	A0	smdNA0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	xb	A1	sndNA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net36	S	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	xb	net29	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net29	xb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net64	S	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	net61	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net61	xb	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	Sb	S	net64	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	Sb	S	net36	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	xb	A0	smdNA0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	xb	A1	sndNA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net36	S	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	xb	net29	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net29	xb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	xb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	xb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net64	S	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	xb	net61	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net61	xb	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	Sb	S	net64	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/mux2/sky130_fd_sc_lp__mux2_lp.spice b/cells/mux2/sky130_fd_sc_lp__mux2_lp.spice
index 21e76bd..671d933 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_lp.spice
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_lp.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__mux2_lp A0 A1 S VGND VNB VPB VPWR X
-M1000 a_123_527# a_84_29# X VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1001 a_84_29# A1 a_281_527# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.008e+11p ps=1.32e+06u
-M1002 VGND a_84_29# a_114_55# VNB nshort w=420000u l=150000u
-+  ad=3.087e+11p pd=3.15e+06u as=8.82e+10p ps=1.26e+06u
-M1003 a_516_55# A1 a_84_29# VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=2.121e+11p ps=1.85e+06u
-M1004 a_702_527# S VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=4.305e+11p ps=3.73e+06u
-M1005 a_307_55# a_200_367# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1006 a_84_29# A0 a_307_55# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_200_367# S a_702_527# VPB phighvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1008 VGND S a_516_55# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_114_55# a_84_29# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1010 a_281_527# a_200_367# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_445_527# A0 a_84_29# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1012 VPWR S a_445_527# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_704_55# S VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1014 a_200_367# S a_704_55# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1015 VPWR a_84_29# a_123_527# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_704_55# S a_200_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_84_29# a_123_527# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VPWR a_200_367# a_281_527# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_84_29# A1 a_516_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_516_55# S VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND S a_704_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_307_55# A0 a_84_29# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_281_527# A1 a_84_29# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VPWR S a_702_527# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_702_527# S a_200_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_84_29# A0 a_445_527# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_114_55# a_84_29# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND a_200_367# a_307_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_445_527# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 X a_84_29# a_114_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_123_527# a_84_29# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_lp2.cdl b/cells/mux2/sky130_fd_sc_lp__mux2_lp2.cdl
index 55cb5d8..750433e 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_lp2.cdl
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_lp2.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__mux2_lp2 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
-MI6 Sb S VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA00 xb A0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 Sb S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 xb A0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA01 smdNA0 Sb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA10 xb A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA11 sndNA1 S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 net56 S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net56 S VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X xb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net29 xb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net29 xb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA00 VPWR S 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
+MMPA01 sndPS A0 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
+MMPA10 VPWR Sb 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
+MMPA11 sndPSb A1 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
+MMIP1 Sb S 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
-MMPA00 VPWR S VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIP2 X xb 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
-MMPA01 sndPS A0 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
-MMPA10 VPWR Sb 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
-MMPA11 sndPSb A1 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
-MMIP1 Sb S 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 xb 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
 .ENDS sky130_fd_sc_lp__mux2_lp2
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_lp2.netlist.tsv b/cells/mux2/sky130_fd_sc_lp__mux2_lp2.netlist.tsv
index 5abf6de..4802e0b 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_lp2.netlist.tsv
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_lp2.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__mux2_lp2	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
-MI6	MOSFET	Sb	S	net56	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA00	MOSFET	xb	A0	smdNA0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	xb	A1	sndNA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net56	S	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	xb	net29	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net29	xb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	Sb	S	net56	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	xb	A0	smdNA0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	xb	A1	sndNA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net56	S	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	xb	net29	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net29	xb	VGND	VNB	nfet_01v8	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	xb	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	xb	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	Sb	S	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	xb	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/mux2/sky130_fd_sc_lp__mux2_lp2.spice b/cells/mux2/sky130_fd_sc_lp__mux2_lp2.spice
index f55494e..97d1565 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_lp2.spice
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_lp2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__mux2_lp2 A0 A1 S VGND VNB VPB VPWR X
-M1000 a_518_401# A0 a_84_259# VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=3.2e+11p ps=2.64e+06u
-M1001 a_115_57# a_84_259# X VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1002 VGND S a_590_57# VNB nshort w=420000u l=150000u
-+  ad=3.948e+11p pd=3.56e+06u as=1.47e+11p ps=1.54e+06u
-M1003 a_84_259# A1 a_306_401# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1004 a_590_57# A1 a_84_259# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.793e+11p ps=2.17e+06u
-M1005 VPWR S a_518_401# VPB phighvt w=1e+06u l=250000u
-+  ad=8.9e+11p pd=5.78e+06u as=0p ps=0u
-M1006 a_84_259# A0 a_349_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1007 VGND a_84_259# a_115_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_776_57# S VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1009 a_182_303# S a_776_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1010 VPWR a_84_259# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1011 a_306_401# a_182_303# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_349_57# a_182_303# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_182_303# S VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
+X0 a_84_259# A1 a_590_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_349_57# A0 a_84_259# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_306_401# A1 a_84_259# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 VPWR S a_182_303# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_84_259# A0 a_518_401# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_518_401# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_115_57# a_84_259# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 X a_84_259# a_115_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_776_57# S a_182_303# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_590_57# S VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 X a_84_259# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 VPWR a_182_303# a_306_401# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 VGND a_182_303# a_349_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VGND S a_776_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_m.cdl b/cells/mux2/sky130_fd_sc_lp__mux2_m.cdl
index 943f502..cffadee 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_m.cdl
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_m.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__mux2_m 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 xb A0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 xb A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X xb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VNB nfet_01v8 m=1 w=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 Sb S VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA10 xb A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X xb VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA11 sndNA1 S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Sb S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN2 X xb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=0.42 l=0.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=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_lp__mux2_m
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_m.netlist.tsv b/cells/mux2/sky130_fd_sc_lp__mux2_m.netlist.tsv
index ea80091..03ce4d1 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_m.netlist.tsv
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_m.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__mux2_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	xb	A1	sndNA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	xb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	xb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	xb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	xb	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	xb	A0	smdNA0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	xb	A1	sndNA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	xb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	xb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	xb	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	xb	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/mux2/sky130_fd_sc_lp__mux2_m.spice b/cells/mux2/sky130_fd_sc_lp__mux2_m.spice
index 542922c..15aa5b4 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_m.spice
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_m.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__mux2_m A0 A1 S VGND VNB VPB VPWR X
-M1000 VPWR a_123_269# X VPB phighvt w=420000u l=150000u
-+  ad=3.822e+11p pd=3.5e+06u as=1.113e+11p ps=1.37e+06u
-M1001 a_123_269# A0 a_329_501# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=8.82e+10p ps=1.26e+06u
-M1002 a_483_99# S VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=3.822e+11p ps=3.5e+06u
-M1003 a_329_501# S VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_123_269# A1 a_261_125# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=8.82e+10p ps=1.26e+06u
-M1005 VPWR a_483_99# a_487_501# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1006 a_483_99# S VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1007 a_261_125# S VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_483_99# a_441_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1009 a_441_125# A0 a_123_269# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_123_269# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1011 a_487_501# A1 a_123_269# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_123_269# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_441_125# a_483_99# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR S a_329_501# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 X a_123_269# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND S a_483_99# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_261_125# A1 a_123_269# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_487_501# a_483_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_123_269# A1 a_487_501# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_329_501# A0 a_123_269# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VGND S a_261_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_123_269# A0 a_441_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR S a_483_99# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_0.cdl b/cells/mux2i/sky130_fd_sc_lp__mux2i_0.cdl
index c9f3bf8..ef6fc31 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_0.cdl
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__mux2i_0 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Y A0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 Y A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S 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
-MMPA01 sndPS A0 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
-MMPA10 VPWR Sb 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
-MMPA11 sndPSb A1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VNB nfet_01v8 m=1 w=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 Sb S VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA10 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA11 sndNA1 S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Sb S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S 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
+MMPA01 sndPS A0 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
+MMPA10 VPWR Sb 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
+MMPA11 sndPSb A1 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
+MMIP1 Sb S 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_lp__mux2i_0
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_0.netlist.tsv b/cells/mux2i/sky130_fd_sc_lp__mux2i_0.netlist.tsv
index ecd291c..bdbe984 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_0.netlist.tsv
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__mux2i_0	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	Y	A1	sndNA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Y	A0	smdNA0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	Y	A1	sndNA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	Y	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	Y	VPB	pfet_01v8_hvt	1	0.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_0.spice b/cells/mux2i/sky130_fd_sc_lp__mux2i_0.spice
index 018e94a..aa5b6f1 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_0.spice
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__mux2i_0 A0 A1 S VGND VNB VPB VPWR Y
-M1000 a_465_491# A0 Y VPB phighvt w=640000u l=150000u
-+  ad=1.76e+11p pd=1.83e+06u as=2.272e+11p ps=1.99e+06u
-M1001 a_244_48# a_47_48# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.969e+11p ps=3.57e+06u
-M1002 VPWR S a_47_48# VPB phighvt w=640000u l=150000u
-+  ad=4.896e+11p pd=4.09e+06u as=1.696e+11p ps=1.81e+06u
-M1003 VGND S a_436_48# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1004 VPWR S a_465_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_436_48# A1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=1.68e+06u
-M1006 VGND S a_47_48# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 a_292_491# a_47_48# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1008 Y A0 a_244_48# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A1 a_292_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_465_491# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_47_48# S VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_47_48# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 Y A1 a_436_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_47_48# a_244_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_436_48# S VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_244_48# A0 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_47_48# a_292_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 a_292_491# A1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 Y A0 a_465_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_1.cdl b/cells/mux2i/sky130_fd_sc_lp__mux2i_1.cdl
index 194843c..8572051 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_1.cdl
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Y A0 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 Y A1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB phighvt m=1 w=1.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 Sb S VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA10 Y A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA11 sndNA1 S VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Sb S VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__mux2i_1
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_1.netlist.tsv b/cells/mux2i/sky130_fd_sc_lp__mux2i_1.netlist.tsv
index 112a58d..44db03f 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_1.netlist.tsv
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	Y	A1	sndNA1	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Y	A0	smdNA0	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	Y	A1	sndNA1	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_1.spice b/cells/mux2i/sky130_fd_sc_lp__mux2i_1.spice
index cdac84e..8dafea5 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_1.spice
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__mux2i_1 A0 A1 S VGND VNB VPB VPWR Y
-M1000 a_212_73# A1 Y VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=2.772e+11p ps=2.34e+06u
-M1001 VPWR S a_304_237# VPB phighvt w=1.26e+06u l=150000u
-+  ad=9.261e+11p pd=6.51e+06u as=3.339e+11p ps=3.05e+06u
-M1002 Y A0 a_52_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.158e+11p pd=3.18e+06u as=6.993e+11p ps=6.15e+06u
-M1003 VGND S a_304_237# VNB nshort w=840000u l=150000u
-+  ad=4.578e+11p pd=4.45e+06u as=2.226e+11p ps=2.21e+06u
-M1004 VPWR a_304_237# a_236_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=4.284e+11p ps=3.2e+06u
-M1005 Y A0 a_29_73# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.62e+11p ps=4.46e+06u
-M1006 VGND a_304_237# a_29_73# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_236_367# A1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_212_73# S VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_52_367# S VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_52_367# A0 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_304_237# S VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_304_237# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_29_73# a_304_237# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND S a_212_73# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_29_73# A0 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Y A1 a_236_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VPWR S a_52_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 Y A1 a_212_73# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_236_367# a_304_237# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_2.cdl b/cells/mux2i/sky130_fd_sc_lp__mux2i_2.cdl
index 5311781..0f4a7f0 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_2.cdl
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Y A0 VNB nfet_01v8 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
-MMNA01 smdNA0 Sb VNB nshort 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
-MMNA10 Y A1 VNB nshort 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
-MMNA11 sndNA1 S VNB nshort 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
-MMIN1 Sb S VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB phighvt m=2 w=1.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VNB nfet_01v8 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 Sb S VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA10 Y A1 VNB nfet_01v8 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
+MMNA11 sndNA1 S VNB nfet_01v8 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
+MMIN1 Sb S VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__mux2i_2
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_2.netlist.tsv b/cells/mux2i/sky130_fd_sc_lp__mux2i_2.netlist.tsv
index 5e1e54c..36c1355 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_2.netlist.tsv
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	Y	A1	sndNA1	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Y	A0	smdNA0	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	Y	A1	sndNA1	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_2.spice b/cells/mux2i/sky130_fd_sc_lp__mux2i_2.spice
index 0ebaa04..674a0e8 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_2.spice
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_2.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_lp__mux2i_2 A0 A1 S VGND VNB VPB VPWR Y
-M1000 Y A1 a_251_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0206e+12p pd=9.18e+06u as=7.056e+11p ps=6.16e+06u
-M1001 Y A0 a_251_47# VNB nshort w=840000u l=150000u
-+  ad=7.644e+11p pd=6.86e+06u as=4.704e+11p ps=4.48e+06u
-M1002 a_251_367# a_44_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.7057e+12p ps=1.056e+07u
-M1003 VGND S a_423_47# VNB nshort w=840000u l=150000u
-+  ad=6.93e+11p pd=6.69e+06u as=5.376e+11p ps=4.64e+06u
-M1004 a_455_367# S VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1005 Y A0 a_455_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR S a_44_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1007 a_423_47# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A1 a_423_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_44_367# a_251_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_423_47# S VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_455_367# A0 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND S a_44_367# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1013 a_251_47# A0 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR S a_455_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_44_367# a_251_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_251_367# A1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_251_47# a_44_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_251_47# a_44_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_455_367# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_251_367# a_44_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR a_44_367# a_251_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 Y A0 a_455_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_251_367# A1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_423_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_44_367# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND S a_423_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_455_367# A0 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 Y A1 a_251_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 Y A0 a_251_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_251_47# A0 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_44_367# S VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 Y A1 a_423_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VGND a_44_367# a_251_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 VPWR S a_455_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_423_47# S VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_4.cdl b/cells/mux2i/sky130_fd_sc_lp__mux2i_4.cdl
index 7d46dd4..48a0093 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_4.cdl
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Y A0 VNB nfet_01v8 m=4 w=0.84 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.84 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.84 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.84 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.84 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VNB nfet_01v8 m=4 w=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 Sb S VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA10 Y A1 VNB nfet_01v8 m=4 w=0.84 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.84 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.84 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__mux2i_4
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_4.netlist.tsv b/cells/mux2i/sky130_fd_sc_lp__mux2i_4.netlist.tsv
index 5831501..b12bed0 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_4.netlist.tsv
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	Y	A1	sndNA1	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Y	A0	smdNA0	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	Y	A1	sndNA1	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_4.spice b/cells/mux2i/sky130_fd_sc_lp__mux2i_4.spice
index c1ce2f7..64a68f1 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_4.spice
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_4.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_lp__mux2i_4 A0 A1 S VGND VNB VPB VPWR Y
-M1000 VPWR S a_126_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.16955e+12p pd=1.619e+07u as=1.4364e+12p ps=1.236e+07u
-M1001 Y A0 a_126_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7262e+12p pd=1.534e+07u as=0p ps=0u
-M1002 Y A1 a_470_69# VNB nshort w=840000u l=150000u
-+  ad=1.2348e+12p pd=1.134e+07u as=1.2734e+12p ps=1.004e+07u
-M1003 a_1418_21# S VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=1.1634e+12p ps=1.117e+07u
-M1004 VPWR S a_126_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_110_69# A0 Y VNB nshort w=840000u l=150000u
-+  ad=9.408e+11p pd=8.96e+06u as=0p ps=0u
-M1006 VGND a_1418_21# a_110_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A1 a_470_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.4112e+12p ps=1.232e+07u
-M1008 VPWR a_1418_21# a_470_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_110_69# a_1418_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND S a_470_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_1418_21# a_470_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND S a_470_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A1 a_470_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_126_367# A0 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1418_21# S VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1016 a_126_367# A0 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_126_367# S VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_470_69# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A1 a_470_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A0 a_110_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_470_367# a_1418_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_470_367# a_1418_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_470_367# A1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_110_69# A0 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y A0 a_126_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_126_367# S VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_1418_21# a_110_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_110_69# a_1418_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y A0 a_110_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_470_69# A1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_470_69# S VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_470_367# A1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_470_69# S VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_470_367# A1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND a_1418_21# a_110_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 Y A1 a_470_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR a_1418_21# a_470_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND S a_470_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_470_69# S VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_126_367# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_110_69# A0 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 Y A1 a_470_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_110_69# a_1418_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 Y A0 a_110_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VGND S a_1418_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_470_367# a_1418_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_110_69# A0 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 Y A0 a_126_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 Y A1 a_470_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_470_367# a_1418_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 VPWR a_1418_21# a_470_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 a_470_69# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 VGND a_1418_21# a_110_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 Y A0 a_126_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 a_126_367# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 a_110_69# a_1418_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_126_367# A0 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 VPWR S a_126_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 a_470_69# A1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 Y A1 a_470_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 Y A0 a_110_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X28 a_470_367# A1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 VPWR S a_126_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 a_126_367# A0 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 VGND S a_470_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X32 VPWR S a_1418_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X33 a_470_69# S VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.cdl b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.cdl
index b10cf70..efe471c 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.cdl
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__mux2i_lp 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
-MI8 Sb S VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA00 Y A0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 Sb S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Y A0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 Y A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nshort m=1 w=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 net46 S VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB phighvt m=1 w=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 Sb S VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VNB nfet_01v8 m=1 w=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 net66 S VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA10 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA11 sndNA1 S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 net46 S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=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 Sb S VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 net66 S VPB pfet_01v8_hvt m=1 w=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_lp__mux2i_lp
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.netlist.tsv b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.netlist.tsv
index 0fcfc47..6124a63 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.netlist.tsv
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__mux2i_lp	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
-MI8	MOSFET	Sb	S	net46	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA00	MOSFET	Y	A0	smdNA0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	Y	A1	sndNA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net46	S	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	Sb	S	net66	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	net66	S	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Sb	S	net46	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Y	A0	smdNA0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	Y	A1	sndNA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net46	S	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	Sb	S	net66	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	Y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	Y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP1	MOSFET	net66	S	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/mux2i/sky130_fd_sc_lp__mux2i_lp.spice b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.spice
index 0db8107..2741c55 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.spice
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__mux2i_lp A0 A1 S VGND VNB VPB VPWR Y
-M1000 a_365_255# S a_510_527# VPB phighvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1001 a_114_49# S VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.814e+11p ps=3.02e+06u
-M1002 Y A0 a_125_527# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.008e+11p ps=1.32e+06u
-M1003 a_509_49# S VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1004 a_365_255# S a_509_49# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1005 a_324_49# A0 Y VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.838e+11p ps=2.34e+06u
-M1006 VGND a_365_255# a_324_49# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_365_255# a_289_527# VPB phighvt w=420000u l=150000u
-+  ad=2.982e+11p pd=3.1e+06u as=1.596e+11p ps=1.6e+06u
-M1008 Y A1 a_114_49# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_289_527# A1 Y VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_125_527# S VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_510_527# S VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND S a_114_49# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR S a_125_527# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_324_49# a_365_255# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_289_527# a_365_255# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_509_49# S a_365_255# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 Y A0 a_324_49# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_125_527# A0 Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 Y A1 a_289_527# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VGND S a_509_49# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR S a_510_527# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_510_527# S a_365_255# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_114_49# A1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.cdl b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.cdl
index c618e42..c4d365e 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.cdl
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.cdl
@@ -16,26 +16,26 @@
 
 .SUBCKT sky130_fd_sc_lp__mux2i_lp2 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
-MI8 Sb S VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMNA00 Y A0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 Sb S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Y A0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 Y A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA01 smdNA0 Sb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA10 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA11 sndNA1 S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 net47 S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 net47 S VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA00 VPWR S 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
+MI7 Sb S 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
-MMPA00 VPWR S 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
-MI7 Sb S 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
-MMPA01 sndPS A0 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
-MMPA10 VPWR Sb 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
-MMPA11 sndPSb A1 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
+MMPA01 sndPS A0 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
+MMPA10 VPWR Sb 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
+MMPA11 sndPSb A1 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_lp__mux2i_lp2
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.netlist.tsv b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.netlist.tsv
index a34365b..74de531 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.netlist.tsv
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.netlist.tsv
@@ -1,13 +1,13 @@
 sky130_fd_sc_lp__mux2i_lp2	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
-MI8	MOSFET	Sb	S	net47	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA00	MOSFET	Y	A0	smdNA0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	Y	A1	sndNA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	net47	S	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	Sb	S	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Sb	S	net47	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Y	A0	smdNA0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	Y	A1	sndNA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	net47	S	VGND	VNB	nfet_01v8	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	Sb	S	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.spice b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.spice
index 307ee64..1943d3b 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.spice
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.spice
@@ -16,26 +16,15 @@
 
 
 .subckt sky130_fd_sc_lp__mux2i_lp2 A0 A1 S VGND VNB VPB VPWR Y
-M1000 a_609_47# S VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=4.431e+11p ps=3.79e+06u
-M1001 VPWR a_490_21# a_410_419# VPB phighvt w=1e+06u l=250000u
-+  ad=6.15e+11p pd=5.23e+06u as=4.3e+11p ps=2.86e+06u
-M1002 VGND a_490_21# a_422_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.428e+11p ps=1.52e+06u
-M1003 a_490_21# S VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1004 Y A1 a_256_47# VNB nshort w=420000u l=150000u
-+  ad=1.218e+11p pd=1.42e+06u as=1.008e+11p ps=1.32e+06u
-M1005 a_256_47# S VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_148_419# S VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1007 Y A0 a_148_419# VPB phighvt w=1e+06u l=250000u
-+  ad=5.7e+11p pd=3.14e+06u as=0p ps=0u
-M1008 a_410_419# A1 Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_490_21# S a_609_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1010 a_422_47# A0 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR S a_148_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_148_419# A0 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_422_47# a_490_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND S a_256_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND S a_609_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_410_419# a_490_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 VPWR S a_490_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 Y A0 a_422_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 Y A1 a_410_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_609_47# S a_490_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_256_47# A1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_m.cdl b/cells/mux2i/sky130_fd_sc_lp__mux2i_m.cdl
index 9f0c1fb..e01e560 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_m.cdl
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__mux2i_m 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA00 Y A0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA01 smdNA0 Sb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA10 Y A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA11 sndNA1 S VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 Sb S VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA00 VPWR S VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA01 sndPS A0 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA10 VPWR Sb VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA11 sndPSb A1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA01 smdNA0 Sb VNB nfet_01v8 m=1 w=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 Sb S VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA10 Y A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
+MMNA11 sndNA1 S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 Sb S VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA00 VPWR S VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA01 sndPS A0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA10 VPWR Sb VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPA11 sndPSb A1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP1 Sb S VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__mux2i_m
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_m.netlist.tsv b/cells/mux2i/sky130_fd_sc_lp__mux2i_m.netlist.tsv
index 9e86f5a..a386ee2 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_m.netlist.tsv
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__mux2i_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA10	MOSFET	Y	A1	sndNA1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA11	MOSFET	sndNA1	S	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	Sb	S	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA00	MOSFET	VPWR	S	sndPS	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA01	MOSFET	sndPS	A0	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA11	MOSFET	sndPSb	A1	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	Sb	S	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA00	MOSFET	Y	A0	smdNA0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA01	MOSFET	smdNA0	Sb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA10	MOSFET	Y	A1	sndNA1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA11	MOSFET	sndNA1	S	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	Sb	S	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA00	MOSFET	VPWR	S	sndPS	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA01	MOSFET	sndPS	A0	Y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA10	MOSFET	VPWR	Sb	sndPSb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA11	MOSFET	sndPSb	A1	Y	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_m.spice b/cells/mux2i/sky130_fd_sc_lp__mux2i_m.spice
index bf2e7b6..18dd3e2 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_m.spice
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__mux2i_m A0 A1 S VGND VNB VPB VPWR Y
-M1000 VGND S a_416_125# VNB nshort w=420000u l=150000u
-+  ad=2.751e+11p pd=2.99e+06u as=1.659e+11p ps=1.63e+06u
-M1001 Y A1 a_256_497# VPB phighvt w=420000u l=150000u
-+  ad=1.974e+11p pd=1.78e+06u as=8.82e+10p ps=1.26e+06u
-M1002 a_452_497# A0 Y VPB phighvt w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1003 VPWR S a_452_497# VPB phighvt w=420000u l=150000u
-+  ad=3.024e+11p pd=3.12e+06u as=0p ps=0u
-M1004 VGND S a_55_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1005 VPWR S a_55_125# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 a_256_497# a_55_125# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A0 a_250_125# VNB nshort w=420000u l=150000u
-+  ad=1.344e+11p pd=1.48e+06u as=8.82e+10p ps=1.26e+06u
-M1008 a_250_125# a_55_125# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_416_125# A1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_55_125# S VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_256_497# A1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_55_125# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VGND a_55_125# a_250_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_452_497# S VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 Y A1 a_416_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_416_125# S VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_55_125# a_256_497# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_250_125# A0 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 Y A0 a_452_497# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_0.cdl b/cells/mux4/sky130_fd_sc_lp__mux4_0.cdl
index 39673c5..8a9a56c 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_0.cdl
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_0.cdl
@@ -16,56 +16,56 @@
 
 .SUBCKT sky130_fd_sc_lp__mux4_0 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.42 l=0.15 mult=1 sa=0.265
+MMNA00 sndNS0ba0 S0b VNB nfet_01v8 m=1 w=0.42 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.42 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.42 l=0.15 mult=1 sa=0.265
+MMNA01 VGND A0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA11 VGND A1 VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MMNA10 sndNS0a1 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.028 perim=0.76
-MMNA21 VGND A2 VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MMNA11 VGND A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA31 VGND A3 VNB nshort m=1 w=0.42 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.42 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.42 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.42 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.42 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.42 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=0.42 l=0.15 mult=1 sa=0.265
+MMNA20 sndNS0ba2 S0b VNB nfet_01v8 m=1 w=0.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265
+MMNA21 VGND A2 VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265
+MMNA30 sndNS0a3 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.028 perim=0.76
-MMPA20 sndPA2a2 A2 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA31 VGND A3 VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNs1o xb S1b VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265
+MMNs2o xb 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.028 perim=0.76
+MMIN1 VGND 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.028 perim=0.76
+MMIN2 VGND 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.028 perim=0.76
+MMIN4 VGND xb VNB nfet_01v8 m=1 w=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=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 pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.64 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_lp__mux4_0
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_0.netlist.tsv b/cells/mux4/sky130_fd_sc_lp__mux4_0.netlist.tsv
index 5681076..21dd201 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_0.netlist.tsv
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_0.netlist.tsv
@@ -1,28 +1,28 @@
 sky130_fd_sc_lp__mux4_0	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.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs2o	MOSFET	xb	S1	xhib	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN1	MOSFET	VGND	S1	S1b	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN2	MOSFET	VGND	S0	S0b	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN4	MOSFET	VGND	xb	X	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs1o	MOSFET	xb	S1	xlowb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs2o	MOSFET	xb	S1b	xhib	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP1	MOSFET	VPWR	S1	S1b	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP2	MOSFET	VPWR	S0	S0b	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP4	MOSFET	VPWR	xb	X	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA00	MOSFET	sndNS0ba0	S0b	xlowb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs2o	MOSFET	xb	S1	xhib	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN1	MOSFET	VGND	S1	S1b	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN2	MOSFET	VGND	S0	S0b	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN4	MOSFET	VGND	xb	X	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs1o	MOSFET	xb	S1	xlowb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs2o	MOSFET	xb	S1b	xhib	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP1	MOSFET	VPWR	S1	S1b	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP2	MOSFET	VPWR	S0	S0b	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP4	MOSFET	VPWR	xb	X	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_0.spice b/cells/mux4/sky130_fd_sc_lp__mux4_0.spice
index a9f87d4..9275b09 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_0.spice
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_0.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_lp__mux4_0 A0 A1 A2 A3 S0 S1 VGND VNB VPB VPWR X
-M1000 a_294_506# a_1029_37# a_1075_493# VPB phighvt w=420000u l=150000u
-+  ad=3.3275e+11p pd=3.28e+06u as=1.176e+11p ps=1.4e+06u
-M1001 a_685_504# S0 a_642_119# VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=8.82e+10p ps=1.26e+06u
-M1002 VGND A3 a_442_119# VNB nshort w=420000u l=150000u
-+  ad=5.523e+11p pd=5.99e+06u as=8.82e+10p ps=1.26e+06u
-M1003 a_800_119# a_31_506# a_685_504# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 a_426_504# a_31_506# a_294_506# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1005 a_642_119# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_294_506# S1 a_1075_493# VNB nshort w=420000u l=150000u
-+  ad=2.583e+11p pd=2.91e+06u as=1.176e+11p ps=1.4e+06u
-M1007 a_442_119# S0 a_294_506# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_1075_493# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1009 a_294_506# a_31_506# a_270_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1010 VPWR A3 a_426_504# VPB phighvt w=420000u l=150000u
-+  ad=6.694e+11p pd=6.71e+06u as=0p ps=0u
-M1011 a_793_504# S0 a_685_504# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.751e+11p ps=2.99e+06u
-M1012 VPWR S0 a_31_506# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1013 VPWR A0 a_793_504# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND S0 a_31_506# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1015 a_270_119# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1075_493# a_1029_37# a_685_504# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_222_506# A2 VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1018 a_1075_493# S1 a_685_504# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_1075_493# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1020 a_294_506# S0 a_222_506# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND S1 a_1029_37# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1022 VPWR S1 a_1029_37# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1023 a_613_504# A1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1024 VGND A0 a_800_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_685_504# a_31_506# a_613_504# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1075_493# S1 a_294_506# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_31_506# S0 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_442_119# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_1029_37# S1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VGND A1 a_642_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_685_504# S0 a_793_504# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_793_504# A0 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_685_504# S1 a_1075_493# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_685_504# a_1029_37# a_1075_493# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR A1 a_613_504# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_613_504# a_31_506# a_685_504# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_31_506# S0 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_1075_493# a_1029_37# a_294_506# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 a_642_119# S0 a_685_504# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_1029_37# S1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_270_119# a_31_506# a_294_506# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_800_119# A0 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VPWR a_1075_493# X VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 VGND A2 a_270_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_294_506# S0 a_442_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VPWR A2 a_222_506# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 a_222_506# S0 a_294_506# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 a_685_504# a_31_506# a_800_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VGND a_1075_493# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_294_506# a_31_506# a_426_504# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X25 a_426_504# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_1.cdl b/cells/mux4/sky130_fd_sc_lp__mux4_1.cdl
index 71a8c93..c322a32 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_1.cdl
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_1.cdl
@@ -16,56 +16,56 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265
+MMNA00 sndNS0ba0 S0b VNB nfet_01v8 m=1 w=0.42 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.42 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.42 l=0.15 mult=1 sa=0.265
+MMNA01 VGND A0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA11 VGND A1 VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MMNA10 sndNS0a1 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.028 perim=0.76
-MMNA21 VGND A2 VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MMNA11 VGND A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA31 VGND A3 VNB nshort m=1 w=0.42 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.42 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.42 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.42 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.42 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.84 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=0.42 l=0.15 mult=1 sa=0.265
+MMNA20 sndNS0ba2 S0b VNB nfet_01v8 m=1 w=0.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265
+MMNA21 VGND A2 VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265
+MMNA30 sndNS0a3 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.028 perim=0.76
-MMPA20 sndPA2a2 A2 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA31 VGND A3 VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNs1o xb S1b VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265
+MMNs2o xb 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.028 perim=0.76
+MMIN1 VGND 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.028 perim=0.76
+MMIN2 VGND 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.028 perim=0.76
+MMIN4 VGND xb VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.028 perim=0.76
+MMPA00 sndPA0a0 A0 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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.26 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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.26 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_lp__mux4_1
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_1.netlist.tsv b/cells/mux4/sky130_fd_sc_lp__mux4_1.netlist.tsv
index cf05bb6..a3ada57 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_1.netlist.tsv
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_1.netlist.tsv
@@ -1,28 +1,28 @@
 sky130_fd_sc_lp__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.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs2o	MOSFET	xb	S1	xhib	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN1	MOSFET	VGND	S1	S1b	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN2	MOSFET	VGND	S0	S0b	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN4	MOSFET	VGND	xb	X	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs1o	MOSFET	xb	S1	xlowb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs2o	MOSFET	xb	S1b	xhib	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP1	MOSFET	VPWR	S1	S1b	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP2	MOSFET	VPWR	S0	S0b	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP4	MOSFET	VPWR	xb	X	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA00	MOSFET	sndNS0ba0	S0b	xlowb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs2o	MOSFET	xb	S1	xhib	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN1	MOSFET	VGND	S1	S1b	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN2	MOSFET	VGND	S0	S0b	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN4	MOSFET	VGND	xb	X	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs1o	MOSFET	xb	S1	xlowb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs2o	MOSFET	xb	S1b	xhib	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP1	MOSFET	VPWR	S1	S1b	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP2	MOSFET	VPWR	S0	S0b	VPB	pfet_01v8_hvt	1	0.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_1.spice b/cells/mux4/sky130_fd_sc_lp__mux4_1.spice
index e974d73..cd018df 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_1.spice
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_1.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_lp__mux4_1 A0 A1 A2 A3 S0 S1 VGND VNB VPB VPWR X
-M1000 VPWR A1 a_27_519# VPB phighvt w=420000u l=150000u
-+  ad=8.547e+11p pd=8.89e+06u as=2.226e+11p ps=2.74e+06u
-M1001 a_1635_149# S1 a_793_117# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=3.423e+11p ps=3.31e+06u
-M1002 X a_1635_149# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1003 a_793_117# S0 a_799_501# VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=2.226e+11p ps=2.74e+06u
-M1004 a_1245_21# S1 VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=7.35e+11p ps=8.01e+06u
-M1005 a_284_81# a_254_55# a_27_519# VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=0p ps=0u
-M1006 a_284_81# a_1245_21# a_1635_149# VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=0p ps=0u
-M1007 a_879_117# a_254_55# a_793_117# VNB nshort w=420000u l=150000u
-+  ad=2.226e+11p pd=2.74e+06u as=0p ps=0u
-M1008 a_212_81# A0 VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1009 a_284_81# a_254_55# a_212_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1245_21# S1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1011 VGND S0 a_254_55# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.10925e+11p ps=1.37e+06u
-M1012 VGND A3 a_710_117# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.74e+06u
-M1013 a_196_519# A0 VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=0p ps=0u
-M1014 VGND A1 a_33_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.52e+11p ps=2.88e+06u
-M1015 a_879_117# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_793_117# S0 a_710_117# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1635_149# S1 a_284_81# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1018 a_33_81# S0 a_284_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A3 a_968_501# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1020 X a_1635_149# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1021 VPWR S0 a_254_55# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1022 a_793_117# a_1245_21# a_1635_149# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_196_519# S0 a_284_81# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_968_501# a_254_55# a_793_117# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_799_501# A2 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_519# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_27_519# a_254_55# a_284_81# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_710_117# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR S1 a_1245_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_284_81# S0 a_196_519# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_793_117# a_254_55# a_968_501# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_799_501# S0 a_793_117# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_968_501# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_212_81# a_254_55# a_284_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_284_81# S0 a_33_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VPWR a_1635_149# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_1635_149# a_1245_21# a_793_117# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 a_793_117# a_254_55# a_879_117# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_33_81# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VPWR A2 a_799_501# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 a_284_81# S1 a_1635_149# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 VGND A0 a_212_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND S1 a_1245_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_710_117# S0 a_793_117# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_1635_149# a_1245_21# a_284_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VGND a_1635_149# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 VPWR A0 a_196_519# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 a_254_55# S0 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X23 a_254_55# S0 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_793_117# S1 a_1635_149# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 VGND A2 a_879_117# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_2.cdl b/cells/mux4/sky130_fd_sc_lp__mux4_2.cdl
index 1455944..4d9f169 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_2.cdl
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_2.cdl
@@ -16,56 +16,56 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265
+MMNA00 sndNS0ba0 S0b VNB nfet_01v8 m=1 w=0.42 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.42 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.42 l=0.15 mult=1 sa=0.265
+MMNA01 VGND A0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA11 VGND A1 VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MMNA10 sndNS0a1 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.028 perim=0.76
-MMNA21 VGND A2 VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MMNA11 VGND A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA31 VGND A3 VNB nshort m=1 w=0.42 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.42 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.42 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.42 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.42 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.84 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=0.64 l=0.15 mult=1 sa=0.265
+MMNA20 sndNS0ba2 S0b VNB nfet_01v8 m=1 w=0.42 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=0.64 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=0.64 l=0.15 mult=1 sa=0.265
+MMNA21 VGND A2 VNB nfet_01v8 m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265
+MMNA30 sndNS0a3 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.028 perim=0.76
-MMPA20 sndPA2a2 A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNA31 VGND A3 VNB nfet_01v8 m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNs1o xb S1b VNB nfet_01v8 m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265
+MMNs2o xb 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.028 perim=0.76
+MMIN1 VGND 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.028 perim=0.76
+MMIN2 VGND 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.028 perim=0.76
+MMIN4 VGND xb VNB nfet_01v8 m=2 w=0.84 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=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=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=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=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=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=0.64 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.26 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=0.64 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=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 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.028 perim=0.76
+MMPA20 sndPA2a2 A2 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.028 perim=0.76
+MMPA21 xhib 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.028 perim=0.76
+MMPA30 sndPA3a3 A3 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.028 perim=0.76
+MMPA31 xhib S0b 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.028 perim=0.76
+MMPs1o xb S1 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.028 perim=0.76
+MMPs2o xb S1b 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.028 perim=0.76
+MMIP1 VPWR S1 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.028 perim=0.76
+MMIP2 VPWR 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.028 perim=0.76
+MMIP4 VPWR xb VPB pfet_01v8_hvt m=2 w=1.26 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_lp__mux4_2
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_2.netlist.tsv b/cells/mux4/sky130_fd_sc_lp__mux4_2.netlist.tsv
index 1d3dd49..ea79808 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_2.netlist.tsv
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_2.netlist.tsv
@@ -1,28 +1,28 @@
 sky130_fd_sc_lp__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.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs2o	MOSFET	xb	S1	xhib	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN1	MOSFET	VGND	S1	S1b	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN2	MOSFET	VGND	S0	S0b	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN4	MOSFET	VGND	xb	X	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs1o	MOSFET	xb	S1	xlowb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs2o	MOSFET	xb	S1b	xhib	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP1	MOSFET	VPWR	S1	S1b	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP2	MOSFET	VPWR	S0	S0b	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP4	MOSFET	VPWR	xb	X	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA00	MOSFET	sndNS0ba0	S0b	xlowb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs2o	MOSFET	xb	S1	xhib	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN1	MOSFET	VGND	S1	S1b	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN2	MOSFET	VGND	S0	S0b	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN4	MOSFET	VGND	xb	X	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs1o	MOSFET	xb	S1	xlowb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs2o	MOSFET	xb	S1b	xhib	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP1	MOSFET	VPWR	S1	S1b	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP2	MOSFET	VPWR	S0	S0b	VPB	pfet_01v8_hvt	1	0.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_2.spice b/cells/mux4/sky130_fd_sc_lp__mux4_2.spice
index d1fba40..a64c8ae 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_2.spice
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_2.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_lp__mux4_2 A0 A1 A2 A3 S0 S1 VGND VNB VPB VPWR X
-M1000 a_196_125# S0 a_1223_119# VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=8.82e+10p ps=1.26e+06u
-M1001 a_1381_119# a_859_351# a_196_125# VNB nshort w=420000u l=150000u
-+  ad=1.344e+11p pd=1.48e+06u as=0p ps=0u
-M1002 X a_110_125# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=1.7686e+12p ps=1.21e+07u
-M1003 a_196_125# a_80_293# a_110_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1004 VGND A0 a_1381_119# VNB nshort w=420000u l=150000u
-+  ad=1.0748e+12p pd=8.96e+06u as=0p ps=0u
-M1005 a_110_125# a_80_293# a_27_125# VPB phighvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=3.488e+11p ps=3.65e+06u
-M1006 a_859_351# S0 VGND VNB nshort w=420000u l=150000u
-+  ad=1.617e+11p pd=1.61e+06u as=0p ps=0u
-M1007 a_1223_119# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_859_351# S0 VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1009 a_27_125# S0 a_825_119# VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=8.82e+10p ps=1.26e+06u
-M1010 VPWR A2 a_975_419# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.7e+06u
-M1011 a_983_119# a_859_351# a_27_125# VNB nshort w=420000u l=150000u
-+  ad=1.344e+11p pd=1.48e+06u as=0p ps=0u
-M1012 a_975_419# S0 a_27_125# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_110_125# S1 a_27_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1400_419# S0 a_196_125# VPB phighvt w=640000u l=150000u
-+  ad=2.304e+11p pd=2e+06u as=4.096e+11p ps=3.84e+06u
-M1015 X a_110_125# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1016 VPWR A0 a_1400_419# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_196_125# S1 a_110_125# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_825_119# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_110_125# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND A2 a_983_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_817_419# A3 VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1022 a_1223_419# A1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1023 VGND S1 a_80_293# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.709e+11p ps=1.66e+06u
-M1024 VGND a_110_125# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR S1 a_80_293# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.029e+11p ps=2e+06u
-M1026 a_27_125# a_859_351# a_817_419# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_196_125# a_859_351# a_1223_419# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_110_125# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND A1 a_1223_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_825_119# S0 a_27_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_80_293# S1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_196_125# a_859_351# a_1381_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_110_125# S1 a_196_125# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 VGND S0 a_859_351# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND A3 a_825_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_27_125# a_80_293# a_110_125# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 a_27_125# a_859_351# a_983_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_80_293# S1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 a_196_125# S0 a_1400_419# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 a_975_419# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 VPWR A3 a_817_419# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 a_817_419# a_859_351# a_27_125# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X15 a_110_125# a_80_293# a_196_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_983_119# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_27_125# S1 a_110_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VPWR a_110_125# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VPWR A1 a_1223_419# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 a_1223_419# a_859_351# a_196_125# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X21 a_27_125# S0 a_975_419# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 VPWR S0 a_859_351# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X23 VGND a_110_125# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 a_1223_119# S0 a_196_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_1400_419# A0 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X26 X a_110_125# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 a_1381_119# A0 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_4.cdl b/cells/mux4/sky130_fd_sc_lp__mux4_4.cdl
index 3947566..eb1010d 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_4.cdl
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_4.cdl
@@ -16,56 +16,56 @@
 
 .SUBCKT sky130_fd_sc_lp__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=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA00 sndNS0ba0 S0b VNB nfet_01v8 m=1 w=0.42 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.42 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.42 l=0.15 mult=1 sa=0.265
+MMNA01 VGND A0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA11 VGND A1 VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MMNA10 sndNS0a1 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.028 perim=0.76
-MMNA21 VGND A2 VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MMNA11 VGND A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA31 VGND A3 VNB nshort m=1 w=0.42 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.42 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.42 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.42 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.42 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.84 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=0.64 l=0.15 mult=1 sa=0.265
+MMNA20 sndNS0ba2 S0b VNB nfet_01v8 m=1 w=0.42 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=0.64 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=0.64 l=0.15 mult=1 sa=0.265
+MMNA21 VGND A2 VNB nfet_01v8 m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265
+MMNA30 sndNS0a3 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.028 perim=0.76
-MMPA20 sndPA2a2 A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNA31 VGND A3 VNB nfet_01v8 m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNs1o xb S1b VNB nfet_01v8 m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265
+MMNs2o xb 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.028 perim=0.76
+MMIN1 VGND 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.028 perim=0.76
+MMIN2 VGND 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.028 perim=0.76
+MMIN4 VGND xb VNB nfet_01v8 m=4 w=0.84 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=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=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=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=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=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=0.64 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.26 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=0.64 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=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 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.028 perim=0.76
+MMPA20 sndPA2a2 A2 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.028 perim=0.76
+MMPA21 xhib 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.028 perim=0.76
+MMPA30 sndPA3a3 A3 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.028 perim=0.76
+MMPA31 xhib S0b 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.028 perim=0.76
+MMPs1o xb S1 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.028 perim=0.76
+MMPs2o xb S1b 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.028 perim=0.76
+MMIP1 VPWR S1 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.028 perim=0.76
+MMIP2 VPWR 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.028 perim=0.76
+MMIP4 VPWR xb VPB pfet_01v8_hvt m=4 w=1.26 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_lp__mux4_4
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_4.netlist.tsv b/cells/mux4/sky130_fd_sc_lp__mux4_4.netlist.tsv
index 4ae41d1..aecc3dd 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_4.netlist.tsv
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_4.netlist.tsv
@@ -1,28 +1,28 @@
 sky130_fd_sc_lp__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	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs2o	MOSFET	xb	S1	xhib	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN1	MOSFET	VGND	S1	S1b	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN2	MOSFET	VGND	S0	S0b	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN4	MOSFET	VGND	xb	X	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs1o	MOSFET	xb	S1	xlowb	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs2o	MOSFET	xb	S1b	xhib	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP1	MOSFET	VPWR	S1	S1b	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP2	MOSFET	VPWR	S0	S0b	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP4	MOSFET	VPWR	xb	X	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA00	MOSFET	sndNS0ba0	S0b	xlowb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs2o	MOSFET	xb	S1	xhib	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN1	MOSFET	VGND	S1	S1b	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN2	MOSFET	VGND	S0	S0b	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN4	MOSFET	VGND	xb	X	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs1o	MOSFET	xb	S1	xlowb	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs2o	MOSFET	xb	S1b	xhib	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP1	MOSFET	VPWR	S1	S1b	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP2	MOSFET	VPWR	S0	S0b	VPB	pfet_01v8_hvt	1	0.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_4.spice b/cells/mux4/sky130_fd_sc_lp__mux4_4.spice
index 81073d6..2c9dfa9 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_4.spice
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_lp__mux4_4 A0 A1 A2 A3 S0 S1 VGND VNB VPB VPWR X
-M1000 a_200_119# a_1041_333# a_999_431# VPB phighvt w=640000u l=150000u
-+  ad=3.488e+11p pd=3.65e+06u as=1.344e+11p ps=1.7e+06u
-M1001 a_952_119# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.58865e+12p ps=1.273e+07u
-M1002 a_1110_119# a_1041_333# a_200_119# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.289e+11p ps=2.77e+06u
-M1003 VPWR A2 a_1589_431# VPB phighvt w=640000u l=150000u
-+  ad=2.2036e+12p pd=1.472e+07u as=2.388e+11p ps=2.12e+06u
-M1004 a_999_431# A1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_114_119# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1006 a_200_119# a_84_277# a_114_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1007 VGND S1 a_84_277# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1008 a_114_119# S1 a_27_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.373e+11p ps=2.81e+06u
-M1009 a_200_119# S1 a_114_119# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1010 a_1589_431# S0 a_27_119# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=4.581e+11p ps=4.09e+06u
-M1011 VPWR a_114_119# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_1403_419# A3 VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1013 a_27_119# a_1041_333# a_1403_419# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_114_119# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1015 X a_114_119# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR S1 a_84_277# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.4375e+11p ps=2.28e+06u
-M1017 a_27_119# S0 a_1367_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1018 X a_114_119# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A0 a_1157_431# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.388e+11p ps=2.12e+06u
-M1020 a_1157_431# S0 a_200_119# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1041_333# S0 VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1022 X a_114_119# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1525_119# a_1041_333# a_27_119# VNB nshort w=420000u l=150000u
-+  ad=1.344e+11p pd=1.48e+06u as=0p ps=0u
-M1024 VGND a_114_119# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1367_119# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1041_333# S0 VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1027 VGND a_114_119# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND A2 a_1525_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_200_119# S0 a_952_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND A0 a_1110_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_114_119# a_84_277# a_27_119# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_114_119# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 X a_114_119# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR a_114_119# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_1525_119# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_27_119# S1 a_114_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND S0 a_1041_333# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_27_119# a_1041_333# a_1525_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 X a_114_119# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR a_114_119# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_84_277# S1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X10 a_200_119# S0 a_1157_431# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 VPWR A1 a_999_431# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 a_999_431# a_1041_333# a_200_119# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 VPWR S0 a_1041_333# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 a_84_277# S1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_1367_119# S0 a_27_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_1589_431# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X17 VGND A1 a_952_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_1110_119# A0 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 X a_114_119# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 a_114_119# a_84_277# a_200_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_27_119# a_84_277# a_114_119# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 VGND a_114_119# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 VGND A3 a_1367_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VPWR A3 a_1403_419# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X25 a_1403_419# a_1041_333# a_27_119# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X26 X a_114_119# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 a_27_119# S0 a_1589_431# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X28 a_200_119# a_1041_333# a_1110_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_114_119# S1 a_200_119# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X30 a_1157_431# A0 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X31 a_952_119# S0 a_200_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_lp.cdl b/cells/mux4/sky130_fd_sc_lp__mux4_lp.cdl
index 03ffc76..d50ae87 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_lp.cdl
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_lp.cdl
@@ -16,62 +16,62 @@
 
 .SUBCKT sky130_fd_sc_lp__mux4_lp 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.42 l=0.15 mult=1 sa=0.265
+MMNA00 sndNS0ba0 S0b VNB nfet_01v8 m=1 w=0.42 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.42 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.42 l=0.15 mult=1 sa=0.265
+MMNA01 VGND A0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA11 VGND A1 VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MMNA10 sndNS0a1 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.028 perim=0.76
-MMNA21 VGND A2 VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MMNA11 VGND A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA31 VGND A3 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA20 sndNS0ba2 S0b VNB nfet_01v8 m=1 w=0.42 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 nfet_01v8 m=1 w=0.42 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 nfet_01v8 m=1 w=0.42 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 nfet_01v8 m=1 w=0.42 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 nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNs2o xb 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.028 perim=0.76
-MMNs2o xb S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 net75 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.028 perim=0.76
+MMIN2 net58 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.028 perim=0.76
+MMIN4 net62 xb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
+MI11 VGND xb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMIN1 net75 S1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI10 VGND 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.028 perim=0.76
-MMIN2 net58 S0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 VGND 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.028 perim=0.76
-MMIN4 net62 xb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA00 sndPA0a0 A0 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.028 perim=0.76
+MMPA01 xlowb S0 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.028 perim=0.76
+MMPA10 sndPA1a1 A1 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.028 perim=0.76
+MMPA11 xlowb S0b 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.028 perim=0.76
+MMPA20 sndPA2a2 A2 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.028 perim=0.76
+MMPA21 xhib S0 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.028 perim=0.76
+MMPA30 sndPA3a3 A3 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.028 perim=0.76
+MMPA31 xhib S0b 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.028 perim=0.76
+MMPs1o xb S1 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.028 perim=0.76
-MI11 VGND xb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.028 perim=0.76
-MI10 VGND 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.028 perim=0.76
-MI9 VGND 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.028 perim=0.76
-MMPA00 sndPA0a0 A0 VPB phighvt m=1 w=1 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
 .ENDS sky130_fd_sc_lp__mux4_lp
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_lp.netlist.tsv b/cells/mux4/sky130_fd_sc_lp__mux4_lp.netlist.tsv
index d05d6d5..b503ce2 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_lp.netlist.tsv
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_lp.netlist.tsv
@@ -1,31 +1,31 @@
 sky130_fd_sc_lp__mux4_lp	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.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs2o	MOSFET	xb	S1	xhib	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN1	MOSFET	net75	S1	S1b	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN2	MOSFET	net58	S0	S0b	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN4	MOSFET	net62	xb	X	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MI11	MOSFET	VGND	xb	net62	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MI10	MOSFET	VGND	S0	net58	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MI9	MOSFET	VGND	S1	net75	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs1o	MOSFET	xb	S1	xlowb	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs2o	MOSFET	xb	S1b	xhib	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP1	MOSFET	VPWR	S1	S1b	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP2	MOSFET	VPWR	S0	S0b	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP4	MOSFET	VPWR	xb	X	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA00	MOSFET	sndNS0ba0	S0b	xlowb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs2o	MOSFET	xb	S1	xhib	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN1	MOSFET	net75	S1	S1b	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN2	MOSFET	net58	S0	S0b	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN4	MOSFET	net62	xb	X	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MI11	MOSFET	VGND	xb	net62	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MI10	MOSFET	VGND	S0	net58	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MI9	MOSFET	VGND	S1	net75	VNB	nfet_01v8	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs1o	MOSFET	xb	S1	xlowb	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs2o	MOSFET	xb	S1b	xhib	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP1	MOSFET	VPWR	S1	S1b	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP2	MOSFET	VPWR	S0	S0b	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP4	MOSFET	VPWR	xb	X	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_lp.spice b/cells/mux4/sky130_fd_sc_lp__mux4_lp.spice
index 4ce7eb4..2ba0475 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_lp.spice
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_lp.spice
@@ -16,62 +16,33 @@
 
 
 .subckt sky130_fd_sc_lp__mux4_lp A0 A1 A2 A3 S0 S1 VGND VNB VPB VPWR X
-M1000 VGND A0 a_1600_47# VNB nshort w=420000u l=150000u
-+  ad=9.156e+11p pd=7.72e+06u as=3.024e+11p ps=2.28e+06u
-M1001 a_470_57# S1 a_84_21# VPB phighvt w=1e+06u l=250000u
-+  ad=9.066e+11p pd=5.87e+06u as=4.75e+11p ps=2.95e+06u
-M1002 a_898_419# A3 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=1.3482e+12p ps=1.081e+07u
-M1003 a_245_411# S0 a_915_101# VNB nshort w=420000u l=150000u
-+  ad=3.1815e+11p pd=3.51e+06u as=1.365e+11p ps=1.49e+06u
-M1004 a_1692_419# S0 a_470_57# VPB phighvt w=1e+06u l=250000u
-+  ad=2.9e+11p pd=2.58e+06u as=0p ps=0u
-M1005 VPWR a_84_21# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1006 a_114_47# a_84_21# X VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1007 VGND S1 a_684_101# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1008 a_1210_419# S0 a_245_411# VPB phighvt w=1e+06u l=250000u
-+  ad=3.05e+11p pd=2.61e+06u as=1.195e+12p ps=6.39e+06u
-M1009 VPWR A2 a_1210_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1433_419# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1011 a_1112_47# a_946_317# a_245_411# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1012 VGND A2 a_1112_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_84_21# a_320_366# a_245_411# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1860_47# S0 VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1015 a_245_411# a_946_317# a_898_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_84_21# S1 a_245_411# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1017 a_684_101# S1 a_320_366# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.533e+11p ps=1.57e+06u
-M1018 a_1414_47# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1019 a_470_57# S0 a_1414_47# VNB nshort w=420000u l=150000u
-+  ad=2.835e+11p pd=3.03e+06u as=0p ps=0u
-M1020 a_946_317# S0 a_1860_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1021 VPWR A0 a_1692_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR S1 a_320_366# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=4.868e+11p ps=3.57e+06u
-M1023 a_470_57# a_946_317# a_1433_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1600_47# a_946_317# a_470_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_470_57# a_320_366# a_84_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND a_84_21# a_114_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_915_101# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_946_317# S0 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
+X0 a_114_47# a_84_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_320_366# S1 a_684_101# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_470_57# S0 a_1692_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 X a_84_21# a_114_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_1600_47# A0 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND S0 a_1860_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND A3 a_915_101# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_245_411# a_946_317# a_1112_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_245_411# a_320_366# a_84_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_1414_47# S0 a_470_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 X a_84_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 a_245_411# S0 a_1210_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 a_1210_419# A2 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X13 a_915_101# S0 a_245_411# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_470_57# a_946_317# a_1600_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VPWR A1 a_1433_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X16 VPWR S0 a_946_317# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X17 a_1433_419# a_946_317# a_470_57# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X18 a_245_411# S1 a_84_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VGND A1 a_1414_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_84_21# a_320_366# a_470_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_84_21# S1 a_470_57# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X22 a_684_101# S1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_1860_47# S0 a_946_317# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VPWR A3 a_898_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X25 a_320_366# S1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X26 a_1112_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_898_419# a_946_317# a_245_411# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X28 a_1692_419# A0 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_m.cdl b/cells/mux4/sky130_fd_sc_lp__mux4_m.cdl
index 92e8f1a..19caf90 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_m.cdl
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_m.cdl
@@ -16,56 +16,56 @@
 
 .SUBCKT sky130_fd_sc_lp__mux4_m 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.42 l=0.15 mult=1 sa=0.265
+MMNA00 sndNS0ba0 S0b VNB nfet_01v8 m=1 w=0.42 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.42 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.42 l=0.15 mult=1 sa=0.265
+MMNA01 VGND A0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA11 VGND A1 VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MMNA10 sndNS0a1 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.028 perim=0.76
-MMNA21 VGND A2 VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MMNA11 VGND A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.028 perim=0.76
-MMNA31 VGND A3 VNB nshort m=1 w=0.42 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.42 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.42 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.42 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.42 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.42 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=0.42 l=0.15 mult=1 sa=0.265
+MMNA20 sndNS0ba2 S0b VNB nfet_01v8 m=1 w=0.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265
+MMNA21 VGND A2 VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265
+MMNA30 sndNS0a3 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.028 perim=0.76
-MMPA20 sndPA2a2 A2 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNA31 VGND A3 VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNs1o xb S1b VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265
+MMNs2o xb 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.028 perim=0.76
+MMIN1 VGND 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.028 perim=0.76
+MMIN2 VGND 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.028 perim=0.76
+MMIN4 VGND xb VNB nfet_01v8 m=1 w=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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=0.42 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_lp__mux4_m
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_m.netlist.tsv b/cells/mux4/sky130_fd_sc_lp__mux4_m.netlist.tsv
index 280cf47..eb2e27a 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_m.netlist.tsv
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_m.netlist.tsv
@@ -1,28 +1,28 @@
 sky130_fd_sc_lp__mux4_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMNs2o	MOSFET	xb	S1	xhib	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN1	MOSFET	VGND	S1	S1b	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN2	MOSFET	VGND	S0	S0b	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIN4	MOSFET	VGND	xb	X	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs1o	MOSFET	xb	S1	xlowb	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMPs2o	MOSFET	xb	S1b	xhib	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP1	MOSFET	VPWR	S1	S1b	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP2	MOSFET	VPWR	S0	S0b	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMIP4	MOSFET	VPWR	xb	X	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA00	MOSFET	sndNS0ba0	S0b	xlowb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA01	MOSFET	VGND	A0	sndNS0ba0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA10	MOSFET	sndNS0a1	S0	xlowb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA11	MOSFET	VGND	A1	sndNS0a1	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA20	MOSFET	sndNS0ba2	S0b	xhib	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA21	MOSFET	VGND	A2	sndNS0ba2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA30	MOSFET	sndNS0a3	S0	xhib	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNA31	MOSFET	VGND	A3	sndNS0a3	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs1o	MOSFET	xb	S1b	xlowb	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMNs2o	MOSFET	xb	S1	xhib	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN1	MOSFET	VGND	S1	S1b	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN2	MOSFET	VGND	S0	S0b	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIN4	MOSFET	VGND	xb	X	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA00	MOSFET	sndPA0a0	A0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA01	MOSFET	xlowb	S0	sndPA0a0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA10	MOSFET	sndPA1a1	A1	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA11	MOSFET	xlowb	S0b	sndPA1a1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA20	MOSFET	sndPA2a2	A2	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA21	MOSFET	xhib	S0	sndPA2a2	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA30	MOSFET	sndPA3a3	A3	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPA31	MOSFET	xhib	S0b	sndPA3a3	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs1o	MOSFET	xb	S1	xlowb	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMPs2o	MOSFET	xb	S1b	xhib	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP1	MOSFET	VPWR	S1	S1b	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP2	MOSFET	VPWR	S0	S0b	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMIP4	MOSFET	VPWR	xb	X	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_m.spice b/cells/mux4/sky130_fd_sc_lp__mux4_m.spice
index 3a8b2e4..d3a0329 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_m.spice
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_m.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_lp__mux4_m A0 A1 A2 A3 S0 S1 VGND VNB VPB VPWR X
-M1000 a_345_126# S0 a_273_463# VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=8.82e+10p ps=1.26e+06u
-M1001 a_273_126# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=5.208e+11p ps=5.84e+06u
-M1002 X a_1184_171# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=7.371e+11p ps=6.87e+06u
-M1003 VGND A3 a_453_126# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1004 a_688_126# a_59_463# a_647_463# VPB phighvt w=420000u l=150000u
-+  ad=3.423e+11p pd=3.31e+06u as=8.82e+10p ps=1.26e+06u
-M1005 a_345_126# a_1118_37# a_1184_171# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1006 a_453_126# S0 a_345_126# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.751e+11p ps=2.99e+06u
-M1007 VPWR A3 a_431_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1008 X a_1184_171# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1009 VGND A0 a_774_126# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1010 VPWR S1 a_1118_37# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1011 a_647_463# A1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_1184_171# S1 a_688_126# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_431_463# a_59_463# a_345_126# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND S0 a_59_463# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1015 a_688_126# S0 a_616_126# VNB nshort w=420000u l=150000u
-+  ad=3.423e+11p pd=3.31e+06u as=8.82e+10p ps=1.26e+06u
-M1016 a_774_126# a_59_463# a_688_126# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_805_463# S0 a_688_126# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1018 a_1184_171# a_1118_37# a_688_126# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1019 VPWR A0 a_805_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_345_126# a_59_463# a_273_126# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_345_126# S1 a_1184_171# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_616_126# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR S0 a_59_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1024 a_273_463# A2 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND S1 a_1118_37# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 a_345_126# a_59_463# a_431_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_647_463# a_59_463# a_688_126# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_1184_171# S1 a_345_126# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_59_463# S0 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_616_126# S0 a_688_126# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_774_126# A0 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_688_126# S0 a_805_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_805_463# A0 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_688_126# S1 a_1184_171# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_1118_37# S1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_59_463# S0 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND A1 a_616_126# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_273_126# a_59_463# a_345_126# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_688_126# a_59_463# a_774_126# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_431_463# A3 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 VPWR A1 a_647_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 VGND A2 a_273_126# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_1184_171# a_1118_37# a_345_126# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 VPWR a_1184_171# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 a_345_126# S0 a_453_126# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VPWR A2 a_273_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 a_273_463# S0 a_345_126# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 a_1118_37# S1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VGND a_1184_171# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_688_126# a_1118_37# a_1184_171# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_453_126# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_0.cdl b/cells/nand2/sky130_fd_sc_lp__nand2_0.cdl
index a96cc7b..d51bd54 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_0.cdl
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_0.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__nand2_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A 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
-MMP1 Y B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y 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
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand2_0
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_0.netlist.tsv b/cells/nand2/sky130_fd_sc_lp__nand2_0.netlist.tsv
index 4936417..02c66e3 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_0.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_0.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__nand2_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.42	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.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	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/nand2/sky130_fd_sc_lp__nand2_0.spice b/cells/nand2/sky130_fd_sc_lp__nand2_0.spice
index 485b555..66a7b42 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_0.spice
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_0.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__nand2_0 A B VGND VNB VPB VPWR Y
-M1000 Y B VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=3.392e+11p ps=3.62e+06u
-M1001 Y A a_124_47# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.008e+11p ps=1.32e+06u
-M1002 VPWR A Y VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_124_47# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_124_47# A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND B a_124_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_1.cdl b/cells/nand2/sky130_fd_sc_lp__nand2_1.cdl
index 6a2f9dc..333de4d 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_1.cdl
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=1 w=1.26 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand2_1
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_1.netlist.tsv b/cells/nand2/sky130_fd_sc_lp__nand2_1.netlist.tsv
index 39bae02..dc932f3 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_1.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.84	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_1.spice b/cells/nand2/sky130_fd_sc_lp__nand2_1.spice
index 60df2e1..06c9910 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_1.spice
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__nand2_1 A B VGND VNB VPB VPWR Y
-M1000 a_112_69# B VGND VNB nshort w=840000u l=150000u
-+  ad=2.016e+11p pd=2.16e+06u as=2.226e+11p ps=2.21e+06u
-M1001 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.678e+11p pd=6.1e+06u as=3.528e+11p ps=3.08e+06u
-M1002 Y A a_112_69# VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1003 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_112_69# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND B a_112_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_2.cdl b/cells/nand2/sky130_fd_sc_lp__nand2_2.cdl
index 347ab70..823c8aa 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_2.cdl
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=2 w=1.26 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 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
+MMN1 sndA B VNB nfet_01v8 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_lp__nand2_2
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_2.netlist.tsv b/cells/nand2/sky130_fd_sc_lp__nand2_2.netlist.tsv
index 2fba633..57583e8 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_2.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_2.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	2	0.84	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_2.spice b/cells/nand2/sky130_fd_sc_lp__nand2_2.spice
index a35c192..ad6e464 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_2.spice
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_2.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__nand2_2 A B VGND VNB VPB VPWR Y
-M1000 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=1.0206e+12p ps=9.18e+06u
-M1001 a_27_65# B VGND VNB nshort w=840000u l=150000u
-+  ad=7.476e+11p pd=6.82e+06u as=2.352e+11p ps=2.24e+06u
-M1002 Y A a_27_65# VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1003 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND B a_27_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_65# A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND B a_27_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_27_65# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 Y A a_27_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_27_65# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_4.cdl b/cells/nand2/sky130_fd_sc_lp__nand2_4.cdl
index 40200df..58dd9c3 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_4.cdl
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__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=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=4 w=1.26 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=4 w=0.84 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.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_lp__nand2_4
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_4.netlist.tsv b/cells/nand2/sky130_fd_sc_lp__nand2_4.netlist.tsv
index 75c86ce..7164b84 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_4.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_4.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__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	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	4	0.84	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_4.spice b/cells/nand2/sky130_fd_sc_lp__nand2_4.spice
index dd95450..f9b2005 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_4.spice
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_4.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__nand2_4 A B VGND VNB VPB VPWR Y
-M1000 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.1168e+12p pd=1.596e+07u as=1.4112e+12p ps=1.232e+07u
-M1001 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_63_65# A Y VNB nshort w=840000u l=150000u
-+  ad=1.2852e+12p pd=1.146e+07u as=4.704e+11p ps=4.48e+06u
-M1003 Y A a_63_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_63_65# B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1006 VGND B a_63_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_63_65# A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A a_63_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_63_65# B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B a_63_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_63_65# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VGND B a_63_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_63_65# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_63_65# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_63_65# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VGND B a_63_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 Y A a_63_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 Y A a_63_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_8.cdl b/cells/nand2/sky130_fd_sc_lp__nand2_8.cdl
index eb852db..b42a4aa 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_8.cdl
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__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=8 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=8 w=1.26 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=8 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=8 w=1.26 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=8 w=0.84 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.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_lp__nand2_8
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_8.netlist.tsv b/cells/nand2/sky130_fd_sc_lp__nand2_8.netlist.tsv
index 72aa5fd..c28c34e 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_8.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_8.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__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	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	VPWR	VPB	pfet_01v8_hvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_8.spice b/cells/nand2/sky130_fd_sc_lp__nand2_8.spice
index c57ecf9..d378b0d 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_8.spice
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_8.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_lp__nand2_8 A B VGND VNB VPB VPWR Y
-M1000 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.9484e+12p pd=2.484e+07u as=3.3138e+12p ps=2.794e+07u
-M1001 a_27_65# B VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+12p pd=2.042e+07u as=9.408e+11p ps=8.96e+06u
-M1002 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A a_27_65# VNB nshort w=840000u l=150000u
-+  ad=1.0248e+12p pd=9.16e+06u as=0p ps=0u
-M1004 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_65# A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_27_65# B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_65# A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND B a_27_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_27_65# A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND B a_27_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_65# B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A a_27_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y A a_27_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND B a_27_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y A a_27_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_27_65# A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND B a_27_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_27_65# B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A a_27_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VGND B a_27_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_27_65# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_27_65# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_27_65# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VGND B a_27_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_27_65# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 VGND B a_27_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_27_65# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 Y A a_27_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 a_27_65# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 a_27_65# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 VGND B a_27_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 Y A a_27_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 a_27_65# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X28 Y A a_27_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_lp.cdl b/cells/nand2/sky130_fd_sc_lp__nand2_lp.cdl
index d6b8f8b..76e9467 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_lp.cdl
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_lp.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__nand2_lp A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y 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
-MMP0 Y A VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 Y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y 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
-MI8 net33 B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y 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
-MI7 net37 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
+MI8 net33 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
+MI7 net37 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_lp__nand2_lp
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_lp.netlist.tsv b/cells/nand2/sky130_fd_sc_lp__nand2_lp.netlist.tsv
index 64622e0..612b32c 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_lp.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_lp.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__nand2_lp	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
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	Y	A	net37	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	net33	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net33	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net37	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP0	MOSFET	Y	A	net37	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	net33	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net33	B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net37	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/nand2/sky130_fd_sc_lp__nand2_lp.spice b/cells/nand2/sky130_fd_sc_lp__nand2_lp.spice
index a755d0b..6a99843 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_lp.spice
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_lp.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__nand2_lp A B VGND VNB VPB VPWR Y
-M1000 a_121_57# B VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1001 a_207_367# A Y VPB phighvt w=420000u l=150000u
-+  ad=2.6835e+11p pd=2.89e+06u as=1.176e+11p ps=1.4e+06u
-M1002 VPWR B a_39_367# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.6835e+11p ps=2.89e+06u
-M1003 Y B a_39_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A a_121_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1005 a_207_367# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A a_207_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_39_367# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VGND B a_121_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_121_57# A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR A a_207_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_39_367# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_lp2.cdl b/cells/nand2/sky130_fd_sc_lp__nand2_lp2.cdl
index a5158d6..594d133 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_lp2.cdl
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_lp2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__nand2_lp2 A B VGND VNB VPB VPWR Y
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I Y:O
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y 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
-MMP0 Y A 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
-MMP1 Y B 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
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMP0 Y A 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
+MMP1 Y B 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_lp__nand2_lp2
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_lp2.netlist.tsv b/cells/nand2/sky130_fd_sc_lp__nand2_lp2.netlist.tsv
index 8b5e1cc..0208c4f 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_lp2.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_lp2.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__nand2_lp2	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
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP0	MOSFET	Y	A	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	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/nand2/sky130_fd_sc_lp__nand2_lp2.spice b/cells/nand2/sky130_fd_sc_lp__nand2_lp2.spice
index 7853ce2..4d1aab8 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_lp2.spice
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_lp2.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__nand2_lp2 A B VGND VNB VPB VPWR Y
-M1000 Y A a_151_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.008e+11p ps=1.32e+06u
-M1001 a_151_57# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1002 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=5.7e+11p pd=5.14e+06u as=2.8e+11p ps=2.56e+06u
-M1003 Y B VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_151_57# A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 VGND B a_151_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_m.cdl b/cells/nand2/sky130_fd_sc_lp__nand2_m.cdl
index 537f7a7..bf4f02e 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_m.cdl
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_m.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__nand2_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y 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
-MMP1 Y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y 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
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand2_m
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_m.netlist.tsv b/cells/nand2/sky130_fd_sc_lp__nand2_m.netlist.tsv
index 9956f0d..7ffd161 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_m.netlist.tsv
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_m.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__nand2_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	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/nand2/sky130_fd_sc_lp__nand2_m.spice b/cells/nand2/sky130_fd_sc_lp__nand2_m.spice
index f75ba3e..a60b182 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_m.spice
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_m.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__nand2_m A B VGND VNB VPB VPWR Y
-M1000 Y B VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.226e+11p ps=2.74e+06u
-M1001 Y A a_124_47# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.008e+11p ps=1.32e+06u
-M1002 VPWR A Y VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_124_47# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_124_47# A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND B a_124_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_1.cdl b/cells/nand2b/sky130_fd_sc_lp__nand2b_1.cdl
index 87b1c04..848859f 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_1.cdl
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand2b_1
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_1.netlist.tsv b/cells/nand2b/sky130_fd_sc_lp__nand2b_1.netlist.tsv
index 245c75c..959c870 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_1.netlist.tsv
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	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.26	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.26	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_1.spice b/cells/nand2b/sky130_fd_sc_lp__nand2b_1.spice
index 01617b9..2c47eca 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_1.spice
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__nand2b_1 A_N B VGND VNB VPB VPWR Y
-M1000 VGND A_N a_40_367# VNB nshort w=420000u l=150000u
-+  ad=2.562e+11p pd=2.4e+06u as=1.113e+11p ps=1.37e+06u
-M1001 Y a_40_367# a_269_47# VNB nshort w=840000u l=150000u
-+  ad=2.856e+11p pd=2.36e+06u as=1.764e+11p ps=2.1e+06u
-M1002 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=7.14e+11p ps=6.32e+06u
-M1003 a_269_47# B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A_N a_40_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 VPWR a_40_367# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_40_367# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND B a_269_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_40_367# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_269_47# a_40_367# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 Y a_40_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_2.cdl b/cells/nand2b/sky130_fd_sc_lp__nand2b_2.cdl
index 984d4f8..2d6bc1a 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_2.cdl
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=2 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 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
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand2b_2
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_2.netlist.tsv b/cells/nand2b/sky130_fd_sc_lp__nand2b_2.netlist.tsv
index 78a48ff..7906891 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_2.netlist.tsv
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	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.26	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.26	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	2	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_2.spice b/cells/nand2b/sky130_fd_sc_lp__nand2b_2.spice
index b3a5947..2fc60fc 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_2.spice
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__nand2b_2 A_N B VGND VNB VPB VPWR Y
-M1000 VGND B a_229_47# VNB nshort w=840000u l=150000u
-+  ad=5.502e+11p pd=4.78e+06u as=5.082e+11p ps=4.57e+06u
-M1001 VPWR A_N a_27_131# VPB phighvt w=420000u l=150000u
-+  ad=1.0668e+12p pd=9.4e+06u as=1.197e+11p ps=1.41e+06u
-M1002 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1003 Y a_27_131# a_229_47# VNB nshort w=840000u l=150000u
-+  ad=2.646e+11p pd=2.31e+06u as=0p ps=0u
-M1004 VPWR a_27_131# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_229_47# a_27_131# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y a_27_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A_N a_27_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1009 a_229_47# B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_131# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VPWR a_27_131# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VGND B a_229_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 Y a_27_131# a_229_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_229_47# a_27_131# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_229_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_27_131# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 Y a_27_131# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_4.cdl b/cells/nand2b/sky130_fd_sc_lp__nand2b_4.cdl
index 28221d0..b2aa322 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_4.cdl
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=1.26 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.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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=4 w=0.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand2b_4
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_4.netlist.tsv b/cells/nand2b/sky130_fd_sc_lp__nand2b_4.netlist.tsv
index 0d5fa49..e4ae3a0 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_4.netlist.tsv
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	4	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_4.spice b/cells/nand2b/sky130_fd_sc_lp__nand2b_4.spice
index 632a58a..5aec838 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_4.spice
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_lp__nand2b_4 A_N B VGND VNB VPB VPWR Y
-M1000 Y a_27_51# a_217_65# VNB nshort w=840000u l=150000u
-+  ad=5.292e+11p pd=4.62e+06u as=1.2096e+12p ps=1.128e+07u
-M1001 a_217_65# a_27_51# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR a_27_51# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.5767e+12p pd=1.669e+07u as=1.4868e+12p ps=1.244e+07u
-M1003 VGND B a_217_65# VNB nshort w=840000u l=150000u
-+  ad=6.93e+11p pd=6.69e+06u as=0p ps=0u
-M1004 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND B a_217_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_27_51# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y a_27_51# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y a_27_51# a_217_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_217_65# B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A_N a_27_51# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1012 Y a_27_51# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_217_65# B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_217_65# a_27_51# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A_N a_27_51# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1017 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_51# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 Y a_27_51# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR a_27_51# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 Y a_27_51# a_217_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_217_65# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_27_51# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_217_65# a_27_51# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VGND B a_217_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VPWR a_27_51# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_217_65# a_27_51# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_217_65# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VGND B a_217_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 Y a_27_51# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 Y a_27_51# a_217_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.cdl b/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.cdl
index b1beafe..94dfbb2 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.cdl
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.cdl
@@ -16,18 +16,18 @@
 
 .SUBCKT sky130_fd_sc_lp__nand2b_lp 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 l=0.25 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 l=0.25 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 Y A 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
-MI5 net41 A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B 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
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N 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
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI5 net41 A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand2b_lp
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.netlist.tsv b/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.netlist.tsv
index 9534491..0ad78c5 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.netlist.tsv
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.netlist.tsv
@@ -1,9 +1,9 @@
 sky130_fd_sc_lp__nand2b_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net41	A_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	net41	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net41	A_N	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	net41	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.spice b/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.spice
index 636ef85..32e1f2d 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.spice
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.spice
@@ -16,18 +16,11 @@
 
 
 .subckt sky130_fd_sc_lp__nand2b_lp A_N B VGND VNB VPB VPWR Y
-M1000 a_119_51# A_N a_32_51# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1001 a_277_51# B VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.176e+11p ps=1.4e+06u
-M1002 Y a_32_51# a_277_51# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1003 VPWR A_N a_32_51# VPB phighvt w=1e+06u l=250000u
-+  ad=6.3e+11p pd=5.26e+06u as=2.85e+11p ps=2.57e+06u
-M1004 VPWR a_32_51# Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1005 VGND A_N a_119_51# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_32_51# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_277_51# a_32_51# Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_119_51# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_32_51# A_N a_119_51# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND B a_277_51# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_32_51# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_m.cdl b/cells/nand2b/sky130_fd_sc_lp__nand2b_m.cdl
index 398dab9..37b837b 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_m.cdl
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_m.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__nand2b_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y 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
-MMP1 Y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y 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
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand2b_m
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_m.netlist.tsv b/cells/nand2b/sky130_fd_sc_lp__nand2b_m.netlist.tsv
index 3aa8360..ce1e560 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_m.netlist.tsv
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_m.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__nand2b_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_m.spice b/cells/nand2b/sky130_fd_sc_lp__nand2b_m.spice
index 963898e..fc95f5c 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_m.spice
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_m.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__nand2b_m A_N B VGND VNB VPB VPWR Y
-M1000 VPWR a_46_54# Y VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=1.176e+11p ps=1.4e+06u
-M1001 a_282_54# B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.583e+11p ps=2.07e+06u
-M1002 Y a_46_54# a_282_54# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1003 Y B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A_N a_46_54# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 VPWR A_N a_46_54# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 Y a_46_54# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VGND B a_282_54# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_46_54# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_282_54# a_46_54# Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_46_54# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_0.cdl b/cells/nand3/sky130_fd_sc_lp__nand3_0.cdl
index 98808b2..f1b3d08 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_0.cdl
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_0.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__nand3_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A 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
-MMP1 Y B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y 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
-MMP2 Y C VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y 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
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand3_0
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_0.netlist.tsv b/cells/nand3/sky130_fd_sc_lp__nand3_0.netlist.tsv
index 26b2f18..9244cfa 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_0.netlist.tsv
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_0.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__nand3_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.42	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.64	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.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	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/nand3/sky130_fd_sc_lp__nand3_0.spice b/cells/nand3/sky130_fd_sc_lp__nand3_0.spice
index 4f4c226..d02b74a 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_0.spice
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_0.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__nand3_0 A B C VGND VNB VPB VPWR Y
-M1000 a_117_47# C VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.113e+11p ps=1.37e+06u
-M1001 Y C VPWR VPB phighvt w=640000u l=150000u
-+  ad=3.488e+11p pd=3.65e+06u as=3.488e+11p ps=3.65e+06u
-M1002 Y A VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR B Y VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_195_47# B a_117_47# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1005 Y A a_195_47# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 a_117_47# B a_195_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND C a_117_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_195_47# A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_1.cdl b/cells/nand3/sky130_fd_sc_lp__nand3_1.cdl
index 044b5cc..91ecd41 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_1.cdl
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=1 w=1.26 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort 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.84 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.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_lp__nand3_1
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_1.netlist.tsv b/cells/nand3/sky130_fd_sc_lp__nand3_1.netlist.tsv
index 8b8ff1a..2399e8b 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_1.netlist.tsv
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_1.spice b/cells/nand3/sky130_fd_sc_lp__nand3_1.spice
index c885583..06bb276 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_1.spice
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__nand3_1 A B C VGND VNB VPB VPWR Y
-M1000 Y C VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.867e+11p pd=6.13e+06u as=8.568e+11p ps=6.4e+06u
-M1001 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A a_219_76# VNB nshort w=840000u l=150000u
-+  ad=4.284e+11p pd=2.7e+06u as=3.528e+11p ps=2.52e+06u
-M1004 a_219_76# B a_141_76# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.016e+11p ps=2.16e+06u
-M1005 a_141_76# C VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
+X0 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_141_76# B a_219_76# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_219_76# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND C a_141_76# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_2.cdl b/cells/nand3/sky130_fd_sc_lp__nand3_2.cdl
index 0cfa8d8..7448d43 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_2.cdl
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=2 w=1.26 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 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
-MMN2 sndB C VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 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
+MMN2 sndB C VNB nfet_01v8 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_lp__nand3_2
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_2.netlist.tsv b/cells/nand3/sky130_fd_sc_lp__nand3_2.netlist.tsv
index ef975b4..1faa6fa 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_2.netlist.tsv
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_2.spice b/cells/nand3/sky130_fd_sc_lp__nand3_2.spice
index 13472be..3df0cc4 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_2.spice
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__nand3_2 A B C VGND VNB VPB VPWR Y
-M1000 VGND C a_298_65# VNB nshort w=840000u l=150000u
-+  ad=3.36e+11p pd=2.48e+06u as=5.04e+11p ps=4.56e+06u
-M1001 VPWR C Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4868e+12p pd=1.244e+07u as=1.0584e+12p ps=9.24e+06u
-M1002 a_43_65# B a_298_65# VNB nshort w=840000u l=150000u
-+  ad=6.804e+11p pd=6.66e+06u as=0p ps=0u
-M1003 a_298_65# B a_43_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_298_65# C VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A a_43_65# VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1010 a_43_65# A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y C VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A a_43_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND C a_298_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_43_65# B a_298_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_298_65# B a_43_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_43_65# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_298_65# C VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_4.cdl b/cells/nand3/sky130_fd_sc_lp__nand3_4.cdl
index f365ed3..3a576ac 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_4.cdl
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=4 w=1.26 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=4 w=0.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=4 w=0.84 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.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_lp__nand3_4
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_4.netlist.tsv b/cells/nand3/sky130_fd_sc_lp__nand3_4.netlist.tsv
index c3e6e66..c9c502d 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_4.netlist.tsv
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_4.spice b/cells/nand3/sky130_fd_sc_lp__nand3_4.spice
index d9230e0..9b263ed 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_4.spice
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_lp__nand3_4 A B C VGND VNB VPB VPWR Y
-M1000 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.1168e+12p pd=1.848e+07u as=2.4696e+12p ps=2.156e+07u
-M1001 VGND C a_460_57# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=9.66e+11p ps=9.02e+06u
-M1002 a_460_57# B a_33_57# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=1.1676e+12p ps=1.118e+07u
-M1003 Y C VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_460_57# C VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A a_33_57# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1007 a_460_57# C VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR C Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_33_57# B a_460_57# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_33_57# B a_460_57# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_33_57# A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND C a_460_57# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR C Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A a_33_57# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_33_57# A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_460_57# B a_33_57# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y C VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_33_57# B a_460_57# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VGND C a_460_57# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_33_57# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_460_57# B a_33_57# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 Y A a_33_57# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_460_57# B a_33_57# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_460_57# C VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 VGND C a_460_57# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 a_33_57# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 a_460_57# C VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 Y A a_33_57# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_33_57# B a_460_57# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_lp.cdl b/cells/nand3/sky130_fd_sc_lp__nand3_lp.cdl
index cc0d9b2..e88deae 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_lp.cdl
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_lp.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__nand3_lp 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 l=0.25 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 l=0.25 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 l=0.25 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.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A 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
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B 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
+MMP2 Y C 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
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand3_lp
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_lp.netlist.tsv b/cells/nand3/sky130_fd_sc_lp__nand3_lp.netlist.tsv
index bc2f897..3abea41 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_lp.netlist.tsv
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_lp.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__nand3_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	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/nand3/sky130_fd_sc_lp__nand3_lp.spice b/cells/nand3/sky130_fd_sc_lp__nand3_lp.spice
index 4389a01..ee9e310 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_lp.spice
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_lp.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__nand3_lp A B C VGND VNB VPB VPWR Y
-M1000 Y C VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=5.65e+11p pd=5.13e+06u as=6.1e+11p ps=5.22e+06u
-M1001 Y A a_233_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.764e+11p ps=1.68e+06u
-M1002 Y A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR B Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_155_47# C VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1005 a_233_47# B a_155_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_155_47# B a_233_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_233_47# A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND C a_155_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_m.cdl b/cells/nand3/sky130_fd_sc_lp__nand3_m.cdl
index 5f07f94..0df9c06 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_m.cdl
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_m.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__nand3_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y 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
-MMP1 Y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y 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
-MMP2 Y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand3_m
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_m.netlist.tsv b/cells/nand3/sky130_fd_sc_lp__nand3_m.netlist.tsv
index d718c24..1dcf083 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_m.netlist.tsv
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_m.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__nand3_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.42	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	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/nand3/sky130_fd_sc_lp__nand3_m.spice b/cells/nand3/sky130_fd_sc_lp__nand3_m.spice
index 3f344da..5af2b20 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_m.spice
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_m.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__nand3_m A B C VGND VNB VPB VPWR Y
-M1000 a_117_47# C VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.113e+11p ps=1.37e+06u
-M1001 Y C VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=2.289e+11p ps=2.77e+06u
-M1002 Y A VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR B Y VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_195_47# B a_117_47# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1005 Y A a_195_47# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 a_117_47# B a_195_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND C a_117_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_195_47# A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_1.cdl b/cells/nand3b/sky130_fd_sc_lp__nand3b_1.cdl
index 01044f2..d2907bf 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_1.cdl
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand3b_1
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_1.netlist.tsv b/cells/nand3b/sky130_fd_sc_lp__nand3b_1.netlist.tsv
index 7b3e23b..2b1c010 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_1.netlist.tsv
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	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.26	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.26	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.26	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_1.spice b/cells/nand3b/sky130_fd_sc_lp__nand3b_1.spice
index 86c118e..121e7e7 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_1.spice
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__nand3b_1 A_N B C VGND VNB VPB VPWR Y
-M1000 a_366_47# B a_275_47# VNB nshort w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=2.562e+11p ps=2.29e+06u
-M1001 Y a_84_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.867e+11p pd=6.13e+06u as=7.896e+11p ps=6.46e+06u
-M1002 a_275_47# C VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.751e+11p ps=2.46e+06u
-M1003 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A_N a_84_131# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 VGND A_N a_84_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 Y a_84_131# a_366_47# VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1007 Y C VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND C a_275_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_84_131# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_275_47# B a_366_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR a_84_131# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_366_47# a_84_131# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_84_131# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_2.cdl b/cells/nand3b/sky130_fd_sc_lp__nand3b_2.cdl
index 269c571..c73c8a3 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_2.cdl
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=2 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 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
-MMN2 sndB C VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 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
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand3b_2
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_2.netlist.tsv b/cells/nand3b/sky130_fd_sc_lp__nand3b_2.netlist.tsv
index 8b3d93c..77c7c92 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_2.netlist.tsv
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	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.26	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.26	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.26	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	2	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_2.spice b/cells/nand3b/sky130_fd_sc_lp__nand3b_2.spice
index e243f2f..18c9307 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_2.spice
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__nand3b_2 A_N B C VGND VNB VPB VPWR Y
-M1000 Y a_55_155# a_332_71# VNB nshort w=840000u l=150000u
-+  ad=3.948e+11p pd=2.62e+06u as=5.376e+11p ps=4.64e+06u
-M1001 Y C VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0584e+12p pd=9.24e+06u as=1.8291e+12p ps=1.313e+07u
-M1002 Y a_55_155# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_332_71# a_55_155# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A_N a_55_155# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 a_246_71# C VGND VNB nshort w=840000u l=150000u
-+  ad=5.04e+11p pd=4.56e+06u as=4.977e+11p ps=4.67e+06u
-M1006 VPWR C Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND C a_246_71# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_246_71# B a_332_71# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A_N a_55_155# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1010 a_332_71# B a_246_71# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_55_155# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_55_155# a_332_71# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_332_71# B a_246_71# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_55_155# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_55_155# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VPWR a_55_155# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_246_71# C VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VGND C a_246_71# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_246_71# B a_332_71# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_332_71# a_55_155# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 Y a_55_155# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_4.cdl b/cells/nand3b/sky130_fd_sc_lp__nand3b_4.cdl
index 699ea4e..ffed0c7 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_4.cdl
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=1.26 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.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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=4 w=0.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=4 w=0.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand3b_4
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_4.netlist.tsv b/cells/nand3b/sky130_fd_sc_lp__nand3b_4.netlist.tsv
index 6c36d39..249d5b1 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_4.netlist.tsv
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	4	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_4.spice b/cells/nand3b/sky130_fd_sc_lp__nand3b_4.spice
index b827547..9ebec90 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_4.spice
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_4.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_lp__nand3b_4 A_N B C VGND VNB VPB VPWR Y
-M1000 a_225_47# a_35_74# Y VNB nshort w=840000u l=150000u
-+  ad=1.1508e+12p pd=1.114e+07u as=4.704e+11p ps=4.48e+06u
-M1001 Y a_35_74# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.1168e+12p pd=1.848e+07u as=2.9043e+12p ps=2.225e+07u
-M1002 a_652_47# C VGND VNB nshort w=840000u l=150000u
-+  ad=9.408e+11p pd=8.96e+06u as=9.03e+11p ps=8.87e+06u
-M1003 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_652_47# C VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR C Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_225_47# B a_652_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_652_47# B a_225_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_35_74# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y a_35_74# a_225_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR C Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A_N a_35_74# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1014 Y a_35_74# a_225_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND C a_652_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR A_N a_35_74# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1017 VPWR a_35_74# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y C VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND C a_652_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y C VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_225_47# B a_652_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR a_35_74# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_652_47# B a_225_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_225_47# a_35_74# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND C a_652_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 Y a_35_74# a_225_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_225_47# B a_652_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 Y a_35_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_652_47# C VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VGND C a_652_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_652_47# B a_225_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_35_74# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_652_47# C VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_35_74# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 Y a_35_74# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VPWR a_35_74# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_225_47# a_35_74# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 Y a_35_74# a_225_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_225_47# a_35_74# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 a_225_47# B a_652_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 VPWR a_35_74# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 a_652_47# B a_225_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.cdl b/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.cdl
index a093761..12b6969 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.cdl
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.cdl
@@ -16,22 +16,22 @@
 
 .SUBCKT sky130_fd_sc_lp__nand3b_lp 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 Y A 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
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B 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
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C 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
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N 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
-MI6 net45 A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net45 A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand3b_lp
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.netlist.tsv b/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.netlist.tsv
index 9dc3c6d..2d81d5b 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.netlist.tsv
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.netlist.tsv
@@ -1,11 +1,11 @@
 sky130_fd_sc_lp__nand3b_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	net45	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net45	A_N	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	net45	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net45	A_N	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/nand3b/sky130_fd_sc_lp__nand3b_lp.spice b/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.spice
index e6eeb60..656a1bc 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.spice
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.spice
@@ -16,22 +16,13 @@
 
 
 .subckt sky130_fd_sc_lp__nand3b_lp A_N B C VGND VNB VPB VPWR Y
-M1000 a_156_141# a_90_247# Y VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1001 VPWR C Y VPB phighvt w=1e+06u l=250000u
-+  ad=6e+11p pd=5.2e+06u as=5.65e+11p ps=5.13e+06u
-M1002 VGND C a_234_141# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=1.008e+11p ps=1.32e+06u
-M1003 Y B VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_90_247# A_N a_420_141# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1005 a_234_141# B a_156_141# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_420_141# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_90_247# Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_90_247# A_N VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
+X0 Y a_90_247# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 Y a_90_247# a_156_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_234_141# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_420_141# A_N a_90_247# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_156_141# B a_234_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND A_N a_420_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 VPWR A_N a_90_247# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_m.cdl b/cells/nand3b/sky130_fd_sc_lp__nand3b_m.cdl
index e278b9c..0b8da2e 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_m.cdl
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_m.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__nand3b_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y 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
-MMP1 Y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y 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
-MMP2 Y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=1 w=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 A A_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand3b_m
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_m.netlist.tsv b/cells/nand3b/sky130_fd_sc_lp__nand3b_m.netlist.tsv
index f2482d4..bbeb82c 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_m.netlist.tsv
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_m.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__nand3b_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	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.42	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_m.spice b/cells/nand3b/sky130_fd_sc_lp__nand3b_m.spice
index 46617af..21f4a22 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_m.spice
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_m.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__nand3b_m A_N B C VGND VNB VPB VPWR Y
-M1000 VPWR A_N a_37_47# VPB phighvt w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=1.113e+11p ps=1.37e+06u
-M1001 VGND A_N a_37_47# VNB nshort w=420000u l=150000u
-+  ad=2.121e+11p pd=1.85e+06u as=1.113e+11p ps=1.37e+06u
-M1002 Y C VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=0p ps=0u
-M1003 Y a_37_47# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_323_47# B a_251_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=8.82e+10p ps=1.26e+06u
-M1005 Y a_37_47# a_323_47# VNB nshort w=420000u l=150000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1006 VPWR B Y VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_251_47# C VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_37_47# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_37_47# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VPWR a_37_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_323_47# a_37_47# Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND C a_251_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_251_47# B a_323_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_0.cdl b/cells/nand4/sky130_fd_sc_lp__nand4_0.cdl
index fbd52d5..60915fe 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_0.cdl
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_0.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__nand4_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A 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
-MMP1 Y B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y 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
-MMP3 Y D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y 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
-MMP2 Y C VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y 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
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand4_0
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_0.netlist.tsv b/cells/nand4/sky130_fd_sc_lp__nand4_0.netlist.tsv
index 139b4cc..6bb9917 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_0.netlist.tsv
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_0.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__nand4_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.42	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.64	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.64	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.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	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/nand4/sky130_fd_sc_lp__nand4_0.spice b/cells/nand4/sky130_fd_sc_lp__nand4_0.spice
index 40a5b74..5530937 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_0.spice
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_0.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__nand4_0 A B C D VGND VNB VPB VPWR Y
-M1000 VPWR A Y VPB phighvt w=640000u l=150000u
-+  ad=5.184e+11p pd=5.46e+06u as=3.584e+11p ps=3.68e+06u
-M1001 Y D VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A a_351_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.764e+11p ps=1.68e+06u
-M1003 Y B VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_159_47# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.113e+11p ps=1.37e+06u
-M1005 a_237_47# C a_159_47# VNB nshort w=420000u l=150000u
-+  ad=1.764e+11p pd=1.68e+06u as=0p ps=0u
-M1006 VPWR C Y VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_351_47# B a_237_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_159_47# C a_237_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_237_47# B a_351_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 VGND D a_159_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_351_47# A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_1.cdl b/cells/nand4/sky130_fd_sc_lp__nand4_1.cdl
index e4f1dd0..37d6d71 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_1.cdl
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=1 w=1.26 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand4_1
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_1.netlist.tsv b/cells/nand4/sky130_fd_sc_lp__nand4_1.netlist.tsv
index 5495c2c..c4e524d 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_1.netlist.tsv
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_1.spice b/cells/nand4/sky130_fd_sc_lp__nand4_1.spice
index 258baed..e8ba518 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_1.spice
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__nand4_1 A B C D VGND VNB VPB VPWR Y
-M1000 a_325_47# B a_211_47# VNB nshort w=840000u l=150000u
-+  ad=3.528e+11p pd=2.52e+06u as=3.528e+11p ps=2.52e+06u
-M1001 VPWR C Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.6002e+12p pd=1.01e+07u as=7.056e+11p ps=6.16e+06u
-M1002 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_211_47# C a_133_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.016e+11p ps=2.16e+06u
-M1004 Y D VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A a_325_47# VNB nshort w=840000u l=150000u
-+  ad=4.284e+11p pd=2.7e+06u as=0p ps=0u
-M1007 a_133_47# D VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
+X0 a_325_47# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_211_47# B a_325_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND D a_133_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_133_47# C a_211_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_2.cdl b/cells/nand4/sky130_fd_sc_lp__nand4_2.cdl
index 93ae82b..1c20fdd 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_2.cdl
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=2 w=1.26 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 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
-MMN2 sndB C VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 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
-MMN3 sndC D VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 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
+MMN3 sndC D VNB nfet_01v8 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_lp__nand4_2
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_2.netlist.tsv b/cells/nand4/sky130_fd_sc_lp__nand4_2.netlist.tsv
index 2ac3bdb..9502aec 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_2.netlist.tsv
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_2.spice b/cells/nand4/sky130_fd_sc_lp__nand4_2.spice
index 1b4fa2f..347b734 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_2.spice
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__nand4_2 A B C D VGND VNB VPB VPWR Y
-M1000 VPWR D Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.5704e+12p pd=1.668e+07u as=1.4112e+12p ps=1.232e+07u
-M1001 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR C Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_69_47# D VGND VNB nshort w=840000u l=150000u
-+  ad=7.056e+11p pd=6.72e+06u as=2.352e+11p ps=2.24e+06u
-M1005 Y D VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_523_67# A Y VNB nshort w=840000u l=150000u
-+  ad=6.972e+11p pd=6.7e+06u as=2.352e+11p ps=2.24e+06u
-M1007 a_523_67# B a_330_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1008 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_330_47# C a_69_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y C VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND D a_69_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A a_523_67# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_330_47# B a_523_67# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_69_47# C a_330_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A a_523_67# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND D a_69_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_69_47# C a_330_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_523_67# B a_330_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_330_47# B a_523_67# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_523_67# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_69_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_330_47# C a_69_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_4.cdl b/cells/nand4/sky130_fd_sc_lp__nand4_4.cdl
index 200afdb..31a6578 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_4.cdl
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=4 w=1.26 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=4 w=0.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=4 w=0.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=4 w=0.84 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.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_lp__nand4_4
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_4.netlist.tsv b/cells/nand4/sky130_fd_sc_lp__nand4_4.netlist.tsv
index 37e7a8e..b32f78f 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_4.netlist.tsv
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_4.spice b/cells/nand4/sky130_fd_sc_lp__nand4_4.spice
index 9414019..53df14f 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_4.spice
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_lp__nand4_4 A B C D VGND VNB VPB VPWR Y
-M1000 Y D VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.8224e+12p pd=2.464e+07u as=3.906e+12p ps=2.888e+07u
-M1001 a_27_65# D VGND VNB nshort w=840000u l=150000u
-+  ad=1.2348e+12p pd=1.134e+07u as=4.704e+11p ps=4.48e+06u
-M1002 Y C VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_843_67# A Y VNB nshort w=840000u l=150000u
-+  ad=1.1844e+12p pd=1.122e+07u as=4.704e+11p ps=4.48e+06u
-M1005 a_843_67# A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_65# C a_454_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=9.408e+11p ps=8.96e+06u
-M1007 Y C VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_454_65# C a_27_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND D a_27_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR D Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_454_65# B a_843_67# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_843_67# B a_454_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR C Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR A Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_27_65# C a_454_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR D Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_843_67# B a_454_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND D a_27_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y A a_843_67# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y A a_843_67# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_454_65# B a_843_67# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y D VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR C Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_454_65# C a_27_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_27_65# D VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_454_65# B a_843_67# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_843_67# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 Y A a_843_67# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_454_65# B a_843_67# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VGND D a_27_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_27_65# D VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_27_65# C a_454_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 a_454_65# C a_27_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 a_843_67# A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 a_843_67# B a_454_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 Y A a_843_67# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 VGND D a_27_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 a_27_65# C a_454_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 a_27_65# D VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X28 a_454_65# C a_27_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 VPWR A Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 a_843_67# B a_454_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_lp.cdl b/cells/nand4/sky130_fd_sc_lp__nand4_lp.cdl
index 2174cf8..321269a 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_lp.cdl
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_lp.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__nand4_lp 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A 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
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B 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
-MMN3 sndC D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D 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
+MMP2 Y C 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
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand4_lp
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_lp.netlist.tsv b/cells/nand4/sky130_fd_sc_lp__nand4_lp.netlist.tsv
index c7312de..ec5f55f 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_lp.netlist.tsv
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_lp.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__nand4_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	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/nand4/sky130_fd_sc_lp__nand4_lp.spice b/cells/nand4/sky130_fd_sc_lp__nand4_lp.spice
index 05a619e..6dd9117 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_lp.spice
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_lp.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__nand4_lp A B C D VGND VNB VPB VPWR Y
-M1000 VPWR C Y VPB phighvt w=1e+06u l=250000u
-+  ad=9.25e+11p pd=7.85e+06u as=5.6e+11p ps=5.12e+06u
-M1001 Y A a_324_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.764e+11p ps=1.68e+06u
-M1002 a_132_47# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1003 a_324_47# B a_210_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=1.68e+06u
-M1004 VPWR A Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y D VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_210_47# C a_132_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND D a_132_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_132_47# C a_210_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_324_47# A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_210_47# B a_324_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_m.cdl b/cells/nand4/sky130_fd_sc_lp__nand4_m.cdl
index 9e5282d..d85f866 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_m.cdl
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_m.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__nand4_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y 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
-MMP1 Y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y 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
-MMP3 Y D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y 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
-MMP2 Y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand4_m
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_m.netlist.tsv b/cells/nand4/sky130_fd_sc_lp__nand4_m.netlist.tsv
index c00d364..c6d835b 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_m.netlist.tsv
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_m.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__nand4_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.42	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.42	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	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/nand4/sky130_fd_sc_lp__nand4_m.spice b/cells/nand4/sky130_fd_sc_lp__nand4_m.spice
index f65c7e7..95e1a7a 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_m.spice
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_m.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__nand4_m A B C D VGND VNB VPB VPWR Y
-M1000 VPWR A Y VPB phighvt w=420000u l=150000u
-+  ad=4.095e+11p pd=4.47e+06u as=2.352e+11p ps=2.8e+06u
-M1001 Y D VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 Y A a_351_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.764e+11p ps=1.68e+06u
-M1003 Y B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_159_47# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.113e+11p ps=1.37e+06u
-M1005 a_237_47# C a_159_47# VNB nshort w=420000u l=150000u
-+  ad=1.764e+11p pd=1.68e+06u as=0p ps=0u
-M1006 VPWR C Y VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_351_47# B a_237_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_159_47# C a_237_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_237_47# B a_351_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VGND D a_159_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_351_47# A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_1.cdl b/cells/nand4b/sky130_fd_sc_lp__nand4b_1.cdl
index b7ca3e6..0d10ba5 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_1.cdl
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand4b_1
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_1.netlist.tsv b/cells/nand4b/sky130_fd_sc_lp__nand4b_1.netlist.tsv
index ed9041c..6987c81 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_1.netlist.tsv
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	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.26	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.26	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.26	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.26	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_1.spice b/cells/nand4b/sky130_fd_sc_lp__nand4b_1.spice
index 281edd4..d3a3b2f 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_1.spice
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__nand4b_1 A_N B C D VGND VNB VPB VPWR Y
-M1000 Y a_71_131# a_442_47# VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=3.276e+11p ps=2.46e+06u
-M1001 Y D VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=1.2621e+12p ps=9.73e+06u
-M1002 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A_N a_71_131# VNB nshort w=420000u l=150000u
-+  ad=2.814e+11p pd=2.46e+06u as=1.113e+11p ps=1.37e+06u
-M1004 a_262_47# D VGND VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1005 a_334_47# C a_262_47# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=0p ps=0u
-M1006 VPWR A_N a_71_131# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 a_442_47# B a_334_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR C Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_71_131# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_71_131# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_442_47# a_71_131# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_71_131# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND D a_262_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 Y a_71_131# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_262_47# C a_334_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_334_47# B a_442_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_2.cdl b/cells/nand4b/sky130_fd_sc_lp__nand4b_2.cdl
index d4c1c13..a621ef9 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_2.cdl
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8_hvt m=2 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 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
-MMN2 sndB C VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 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
-MMN3 sndC D VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 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
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand4b_2
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_2.netlist.tsv b/cells/nand4b/sky130_fd_sc_lp__nand4b_2.netlist.tsv
index 0334ef6..c611b50 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_2.netlist.tsv
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	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.26	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.26	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.26	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.26	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	2	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_2.spice b/cells/nand4b/sky130_fd_sc_lp__nand4b_2.spice
index 3cdd097..f76c5f6 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_2.spice
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_2.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_lp__nand4b_2 A_N B C D VGND VNB VPB VPWR Y
-M1000 a_486_65# B a_217_65# VNB nshort w=840000u l=150000u
-+  ad=5.292e+11p pd=4.62e+06u as=7.392e+11p ps=6.8e+06u
-M1001 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4238e+12p pd=1.234e+07u as=2.7762e+12p ps=1.726e+07u
-M1002 a_217_65# a_27_51# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1003 Y a_27_51# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR C Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND D a_697_69# VNB nshort w=840000u l=150000u
-+  ad=3.549e+11p pd=3.63e+06u as=7.476e+11p ps=6.82e+06u
-M1006 a_486_65# C a_697_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR D Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_27_51# a_217_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A_N a_27_51# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1011 Y C VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_697_69# C a_486_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A_N a_27_51# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1014 a_697_69# D VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR a_27_51# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_217_65# B a_486_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y D VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_51# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_486_65# B a_217_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_697_69# C a_486_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_486_65# C a_697_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_217_65# B a_486_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_217_65# a_27_51# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_27_51# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_697_69# D VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VGND D a_697_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 Y a_27_51# a_217_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 Y a_27_51# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 VPWR a_27_51# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_4.cdl b/cells/nand4b/sky130_fd_sc_lp__nand4b_4.cdl
index c7ee343..8240e06 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_4.cdl
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=1.26 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.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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=4 w=0.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=4 w=0.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=4 w=0.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand4b_4
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_4.netlist.tsv b/cells/nand4b/sky130_fd_sc_lp__nand4b_4.netlist.tsv
index 703b467..6b07d6b 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_4.netlist.tsv
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	4	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_4.spice b/cells/nand4b/sky130_fd_sc_lp__nand4b_4.spice
index cc89b6b..06a17af 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_4.spice
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_4.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_lp__nand4b_4 A_N B C D VGND VNB VPB VPWR Y
-M1000 VPWR A_N a_27_51# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.1895e+12p pd=2.933e+07u as=3.339e+11p ps=3.05e+06u
-M1001 a_217_51# a_27_51# Y VNB nshort w=840000u l=150000u
-+  ad=1.1508e+12p pd=1.114e+07u as=4.704e+11p ps=4.48e+06u
-M1002 a_644_51# B a_217_51# VNB nshort w=840000u l=150000u
-+  ad=1.0752e+12p pd=9.28e+06u as=0p ps=0u
-M1003 a_1025_65# C a_644_51# VNB nshort w=840000u l=150000u
-+  ad=1.1844e+12p pd=1.122e+07u as=0p ps=0u
-M1004 VPWR C Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=2.8224e+12p ps=2.464e+07u
-M1005 a_217_51# a_27_51# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR D Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_27_51# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y a_27_51# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y C VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_217_51# B a_644_51# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND D a_1025_65# VNB nshort w=840000u l=150000u
-+  ad=6.93e+11p pd=6.69e+06u as=0p ps=0u
-M1013 a_644_51# B a_217_51# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1025_65# C a_644_51# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND D a_1025_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y D VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y a_27_51# a_217_51# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y C VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y a_27_51# a_217_51# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y a_27_51# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y D VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_217_51# B a_644_51# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1025_65# D VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_644_51# C a_1025_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_27_51# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A_N a_27_51# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1028 a_644_51# C a_1025_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR D Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR C Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1025_65# D VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 Y a_27_51# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_27_51# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_644_51# C a_1025_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_1025_65# C a_644_51# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_27_51# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 Y a_27_51# a_217_51# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_644_51# C a_1025_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VPWR a_27_51# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_1025_65# D VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_217_51# a_27_51# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 a_644_51# B a_217_51# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 Y a_27_51# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 VGND D a_1025_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 Y a_27_51# a_217_51# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 a_1025_65# D VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 a_217_51# B a_644_51# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 VGND D a_1025_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X28 a_644_51# B a_217_51# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 a_217_51# B a_644_51# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X30 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 a_1025_65# C a_644_51# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X32 VPWR a_27_51# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X33 a_217_51# a_27_51# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.cdl b/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.cdl
index 8c608c5..314d205 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.cdl
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.cdl
@@ -16,26 +16,26 @@
 
 .SUBCKT sky130_fd_sc_lp__nand4b_lp 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 Y A 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
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B 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
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C 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
-MMN3 sndC D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D 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
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N 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
-MI7 net52 A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net52 A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand4b_lp
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.netlist.tsv b/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.netlist.tsv
index 9879aa3..2033dc2 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.netlist.tsv
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.netlist.tsv
@@ -1,13 +1,13 @@
 sky130_fd_sc_lp__nand4b_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	net52	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net52	A_N	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	net52	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net52	A_N	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/nand4b/sky130_fd_sc_lp__nand4b_lp.spice b/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.spice
index 19c1eb9..dc9a0ae 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.spice
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.spice
@@ -16,26 +16,15 @@
 
 
 .subckt sky130_fd_sc_lp__nand4b_lp A_N B C D VGND VNB VPB VPWR Y
-M1000 a_173_47# a_87_231# Y VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1001 a_87_231# A_N VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=8.65e+11p ps=7.73e+06u
-M1002 a_509_47# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.512e+11p ps=1.56e+06u
-M1003 VPWR B Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=5.6e+11p ps=5.12e+06u
-M1004 VPWR D Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_329_47# C a_251_47# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.008e+11p ps=1.32e+06u
-M1006 VGND D a_329_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y C VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y a_87_231# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_251_47# B a_173_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_87_231# A_N a_509_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
+X0 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 VPWR A_N a_87_231# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_251_47# C a_329_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y a_87_231# a_173_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 Y B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_509_47# A_N a_87_231# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_87_231# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_329_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_173_47# B a_251_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND A_N a_509_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_m.cdl b/cells/nand4b/sky130_fd_sc_lp__nand4b_m.cdl
index 9f18034..7c69d7b 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_m.cdl
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__nand4b_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y 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
-MMP1 Y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y 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
-MMP2 Y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y 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
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand4b_m
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_m.netlist.tsv b/cells/nand4b/sky130_fd_sc_lp__nand4b_m.netlist.tsv
index 9f63d92..f5dbd28 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_m.netlist.tsv
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__nand4b_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	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.42	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.42	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_m.spice b/cells/nand4b/sky130_fd_sc_lp__nand4b_m.spice
index 3df5552..633e1f8 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_m.spice
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__nand4b_m A_N B C D VGND VNB VPB VPWR Y
-M1000 VPWR C Y VPB phighvt w=420000u l=150000u
-+  ad=4.893e+11p pd=4.85e+06u as=2.352e+11p ps=2.8e+06u
-M1001 a_451_52# B a_343_52# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=1.638e+11p ps=1.62e+06u
-M1002 VPWR a_35_392# Y VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A_N a_35_392# VNB nshort w=420000u l=150000u
-+  ad=2.457e+11p pd=2.01e+06u as=1.113e+11p ps=1.37e+06u
-M1004 Y D VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A_N a_35_392# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 Y B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y a_35_392# a_451_52# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1008 a_271_52# D VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1009 a_343_52# C a_271_52# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_35_392# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_35_392# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_271_52# C a_343_52# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_343_52# B a_451_52# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VGND D a_271_52# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_35_392# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_451_52# a_35_392# Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR B Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.cdl b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.cdl
index 56a8ca5..58b17c9 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.cdl
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=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 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.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 phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 sndA B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand4bb_1
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.netlist.tsv b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.netlist.tsv
index a759359..5996454 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.netlist.tsv
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.42	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.26	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.26	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.26	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.26	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.84	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.spice b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.spice
index 06997f8..278f466 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.spice
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__nand4bb_1 A_N B_N C D VGND VNB VPB VPWR Y
-M1000 Y a_49_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=1.533e+12p ps=1.08e+07u
-M1001 a_552_21# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=4.053e+11p ps=3.92e+06u
-M1002 a_294_47# D VGND VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1003 a_366_47# C a_294_47# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=0p ps=0u
-M1004 VPWR C Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_474_47# a_49_367# a_366_47# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=0p ps=0u
-M1006 VGND B_N a_49_367# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1007 VPWR B_N a_49_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1008 VPWR a_552_21# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_552_21# a_474_47# VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1010 a_552_21# A_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1011 Y D VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND D a_294_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 Y a_552_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR A_N a_552_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_49_367# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_294_47# C a_366_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VGND A_N a_552_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_366_47# a_49_367# a_474_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_474_47# a_552_21# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VPWR a_49_367# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_49_367# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.cdl b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.cdl
index 528e847..8d27a39 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.cdl
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8_hvt m=2 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=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 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=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 phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 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
-MMN2 sndB C VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 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
-MMN3 sndC D VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand4bb_2
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.netlist.tsv b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.netlist.tsv
index ee16ece..b8957ca 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.netlist.tsv
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.42	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.26	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.26	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.26	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.26	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	2	0.84	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.spice b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.spice
index fa4a4f1..2f76fd5 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.spice
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__nand4bb_2 A_N B_N C D VGND VNB VPB VPWR Y
-M1000 VPWR B_N a_27_373# VPB phighvt w=420000u l=150000u
-+  ad=1.9572e+12p pd=1.728e+07u as=1.113e+11p ps=1.37e+06u
-M1001 Y a_27_373# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.89e+12p pd=1.308e+07u as=0p ps=0u
-M1002 VGND D a_821_47# VNB nshort w=840000u l=150000u
-+  ad=3.528e+11p pd=3.64e+06u as=6.804e+11p ps=6.66e+06u
-M1003 Y a_223_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y C VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_357_47# a_27_373# a_614_47# VNB nshort w=840000u l=150000u
-+  ad=6.888e+11p pd=6.68e+06u as=5.292e+11p ps=4.62e+06u
-M1006 a_223_49# A_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1007 a_614_47# C a_821_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y a_223_49# a_357_47# VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1009 a_614_47# a_27_373# a_357_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_821_47# D VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y D VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR a_27_373# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_357_47# a_223_49# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR D Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B_N a_27_373# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1016 a_223_49# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1017 a_821_47# C a_614_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_223_49# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR C Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 Y a_223_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND A_N a_223_49# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 Y a_223_49# a_357_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_614_47# a_27_373# a_357_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR A_N a_223_49# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VPWR a_27_373# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_357_47# a_223_49# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_27_373# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_357_47# a_27_373# a_614_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_27_373# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 VPWR a_223_49# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 Y a_27_373# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_821_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 VGND D a_821_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_821_47# C a_614_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 a_614_47# C a_821_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.cdl b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.cdl
index f08966c..0510acb 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.cdl
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y A VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y B VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.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 phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=4 w=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=4 w=0.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=4 w=0.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand4bb_4
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.netlist.tsv b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.netlist.tsv
index ec8158c..3ec3ad6 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.netlist.tsv
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	4	0.84	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.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.spice b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.spice
index 8972860..affe59f 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.spice
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_lp__nand4bb_4 A_N B_N C D VGND VNB VPB VPWR Y
-M1000 a_324_45# a_217_69# a_842_67# VNB nshort w=840000u l=150000u
-+  ad=1.6287e+12p pd=1.271e+07u as=9.408e+11p ps=8.96e+06u
-M1001 a_842_67# C a_1251_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=1.1508e+12p ps=1.114e+07u
-M1002 VPWR A_N a_44_69# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.6242e+12p pd=3.254e+07u as=3.339e+11p ps=3.05e+06u
-M1003 Y D VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.8224e+12p pd=2.464e+07u as=0p ps=0u
-M1004 a_217_69# B_N VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=7.056e+11p ps=6.72e+06u
-M1005 Y a_217_69# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR C Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_44_69# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_1251_47# D VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y C VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1251_47# D VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_217_69# B_N VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1012 a_842_67# a_217_69# a_324_45# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1251_47# C a_842_67# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_44_69# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y a_44_69# a_324_45# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1016 a_324_45# a_44_69# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_842_67# C a_1251_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_217_69# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1251_47# C a_842_67# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y C VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR D Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_324_45# a_217_69# a_842_67# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR a_217_69# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND D a_1251_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y a_44_69# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR D Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y D VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y a_44_69# a_324_45# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_324_45# a_44_69# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_842_67# a_217_69# a_324_45# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y a_217_69# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND A_N a_44_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.25e+06u
-M1033 VPWR C Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND D a_1251_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 Y a_44_69# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_44_69# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_842_67# C a_1251_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_324_45# a_44_69# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_324_45# a_217_69# a_842_67# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_1251_47# C a_842_67# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_324_45# a_44_69# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VPWR a_217_69# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR a_44_69# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 Y a_44_69# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_1251_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VGND D a_1251_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_44_69# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_1251_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 Y a_217_69# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VPWR a_217_69# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VPWR a_44_69# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 Y a_217_69# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 Y a_44_69# a_324_45# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 a_842_67# a_217_69# a_324_45# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 VGND B_N a_217_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 VGND D a_1251_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 Y a_44_69# a_324_45# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X28 a_842_67# C a_1251_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 VPWR B_N a_217_69# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X32 a_44_69# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X33 a_842_67# a_217_69# a_324_45# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X34 a_324_45# a_217_69# a_842_67# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X35 a_1251_47# C a_842_67# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.cdl b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.cdl
index 66657d8..794d5b5 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.cdl
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__nand4bb_lp 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 Y A 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
-MMIP1 B B_N VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP1 Y B 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
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C 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
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y D 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
-MMN3 sndC D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N 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
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP1 B B_N 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
-MMIN1 B B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net64 A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net60 B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net64 A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net60 B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand4bb_lp
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.netlist.tsv b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.netlist.tsv
index 4ec2ed4..967b8d5 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.netlist.tsv
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__nand4bb_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	net64	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	net60	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net64	A_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net60	B_N	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	Y	B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	Y	C	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	Y	D	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	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.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN0	MOSFET	A	A_N	net64	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	net60	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net64	A_N	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net60	B_N	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/nand4bb/sky130_fd_sc_lp__nand4bb_lp.spice b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.spice
index 3cc201b..8f1b2ee 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.spice
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__nand4bb_lp A_N B_N C D VGND VNB VPB VPWR Y
-M1000 Y a_27_47# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=5.6e+11p pd=5.12e+06u as=1.19e+12p ps=8.38e+06u
-M1001 a_332_352# B_N a_708_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1002 a_114_47# A_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1003 a_384_47# a_27_47# Y VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1004 Y C VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_456_47# a_332_352# a_384_47# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1006 a_534_47# C a_456_47# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1007 a_708_47# B_N VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.583e+11p ps=2.91e+06u
-M1008 VPWR A_N a_27_47# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1009 VPWR a_332_352# Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_332_352# B_N VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1011 VGND A_N a_114_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR D Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND D a_534_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_114_47# A_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_27_47# A_N a_114_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 Y D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_456_47# C a_534_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_27_47# A_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_534_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND B_N a_708_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_384_47# a_332_352# a_456_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 Y a_332_352# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 VPWR C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 VPWR B_N a_332_352# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 a_708_47# B_N a_332_352# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VPWR a_27_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X13 Y a_27_47# a_384_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.cdl b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.cdl
index 1439407..f9d15f4 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.cdl
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__nand4bb_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 Y 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
-MMP1 Y B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP1 Y 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
-MMP2 Y C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP2 Y C VPB pfet_01v8_hvt m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP3 Y 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
-MMIP0 A A_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP0 A A_N VPB pfet_01v8_hvt m=1 w=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 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 sndA B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y 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
-MMN1 sndA B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 sndB C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 sndB C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 sndC D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 sndC D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN0 A A_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN0 A A_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nand4bb_m
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.netlist.tsv b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.netlist.tsv
index e4eabdf..c922248 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.netlist.tsv
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__nand4bb_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	Y	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	Y	C	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	Y	D	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP0	MOSFET	A	A_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	sndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	sndA	B	sndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	sndB	C	sndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	sndC	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN0	MOSFET	A	A_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.42	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.42	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.42	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.42	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	sndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	sndA	B	sndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	sndB	C	sndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	sndC	D	VGND	VNB	nfet_01v8	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.spice b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.spice
index 36c6fa5..11746e5 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.spice
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__nand4bb_m A_N B_N C D VGND VNB VPB VPWR Y
-M1000 a_247_151# D VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.36e+11p ps=3.28e+06u
-M1001 Y a_469_125# a_427_151# VNB nshort w=420000u l=150000u
-+  ad=1.425e+11p pd=1.64e+06u as=8.82e+10p ps=1.26e+06u
-M1002 VPWR C Y VPB phighvt w=420000u l=150000u
-+  ad=5.581e+11p pd=5.21e+06u as=2.352e+11p ps=2.8e+06u
-M1003 VPWR B_N a_27_151# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 VPWR a_469_125# Y VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND B_N a_27_151# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 a_427_151# a_27_151# a_319_151# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.638e+11p ps=1.62e+06u
-M1007 a_469_125# A_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1008 a_469_125# A_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1009 Y D VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y a_27_151# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_319_151# C a_247_151# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_27_151# Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_427_151# a_469_125# Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_27_151# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_319_151# a_27_151# a_427_151# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_27_151# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 Y a_469_125# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VGND A_N a_469_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR A_N a_469_125# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VGND D a_247_151# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR D Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 Y C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_247_151# C a_319_151# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_0.cdl b/cells/nor2/sky130_fd_sc_lp__nor2_0.cdl
index 9a99d83..24bb3ba 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_0.cdl
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_0.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__nor2_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A 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
+MMP1 sndPA 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
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y 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
-MMN1 Y 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
 .ENDS sky130_fd_sc_lp__nor2_0
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_0.netlist.tsv b/cells/nor2/sky130_fd_sc_lp__nor2_0.netlist.tsv
index db18348..00a7d8f 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_0.netlist.tsv
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_0.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__nor2_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.42	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.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	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/nor2/sky130_fd_sc_lp__nor2_0.spice b/cells/nor2/sky130_fd_sc_lp__nor2_0.spice
index d5c49a8..59f4e76 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_0.spice
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_0.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__nor2_0 A B VGND VNB VPB VPWR Y
-M1000 VGND B Y VNB nshort w=420000u l=150000u
-+  ad=2.226e+11p pd=2.74e+06u as=1.176e+11p ps=1.4e+06u
-M1001 a_120_483# A VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.696e+11p ps=1.81e+06u
-M1002 Y B a_120_483# VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1003 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_120_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_120_483# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_1.cdl b/cells/nor2/sky130_fd_sc_lp__nor2_1.cdl
index 2b1411a..542542f 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_1.cdl
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_1.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.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 phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor2_1
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_1.netlist.tsv b/cells/nor2/sky130_fd_sc_lp__nor2_1.netlist.tsv
index b630e70..067294b 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_1.netlist.tsv
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_1.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.84	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_1.spice b/cells/nor2/sky130_fd_sc_lp__nor2_1.spice
index 80f8b4a..3313851 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_1.spice
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_1.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__nor2_1 A B VGND VNB VPB VPWR Y
-M1000 a_116_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.024e+11p pd=3e+06u as=3.339e+11p ps=3.05e+06u
-M1001 Y B a_116_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1002 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=4.452e+11p pd=4.42e+06u as=2.352e+11p ps=2.24e+06u
-M1003 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_116_367# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR A a_116_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_2.cdl b/cells/nor2/sky130_fd_sc_lp__nor2_2.cdl
index 13bdf77..045d8c4 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_2.cdl
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_2.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.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 phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 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.84 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.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_lp__nor2_2
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_2.netlist.tsv b/cells/nor2/sky130_fd_sc_lp__nor2_2.netlist.tsv
index 0e6cbcc..e7e4326 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_2.netlist.tsv
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_2.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	2	0.84	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_2.spice b/cells/nor2/sky130_fd_sc_lp__nor2_2.spice
index 2465b72..592abce 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_2.spice
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_2.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__nor2_2 A B VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=7.098e+11p ps=6.73e+06u
-M1001 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_28_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.2033e+12p pd=9.47e+06u as=3.528e+11p ps=3.08e+06u
-M1004 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_28_367# B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1006 VPWR A a_28_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B a_28_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_28_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_28_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 Y B a_28_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_28_367# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_4.cdl b/cells/nor2/sky130_fd_sc_lp__nor2_4.cdl
index 26e5a41..da96171 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_4.cdl
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_4.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.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 phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=4 w=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.84 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.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_lp__nor2_4
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_4.netlist.tsv b/cells/nor2/sky130_fd_sc_lp__nor2_4.netlist.tsv
index 6add28f..94d0863 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_4.netlist.tsv
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_4.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	4	0.84	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_4.spice b/cells/nor2/sky130_fd_sc_lp__nor2_4.spice
index 442ab5b..11b4f97 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_4.spice
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_4.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__nor2_4 A B VGND VNB VPB VPWR Y
-M1000 a_73_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7262e+12p pd=1.534e+07u as=7.056e+11p ps=6.16e+06u
-M1001 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=9.408e+11p pd=8.96e+06u as=1.1508e+12p ps=1.114e+07u
-M1002 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_73_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_73_367# B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1006 VPWR A a_73_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A a_73_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B a_73_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_73_367# B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y B a_73_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_73_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR A a_73_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 Y B a_73_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_73_367# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VPWR A a_73_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 Y B a_73_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_73_367# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_73_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_8.cdl b/cells/nor2/sky130_fd_sc_lp__nor2_8.cdl
index be8663c..9602e2a 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_8.cdl
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_8.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=8 w=1.26 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.26 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=8 w=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 phighvt m=8 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=8 w=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=8 w=0.84 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=8 w=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_lp__nor2_8
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_8.netlist.tsv b/cells/nor2/sky130_fd_sc_lp__nor2_8.netlist.tsv
index f3f8db7..c4ef45d 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_8.netlist.tsv
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_8.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	8	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	8	0.84	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	8	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_8.spice b/cells/nor2/sky130_fd_sc_lp__nor2_8.spice
index 7bb5fe4..a36429c 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_8.spice
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_8.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_lp__nor2_8 A B VGND VNB VPB VPWR Y
-M1000 VPWR A a_47_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=3.1374e+12p ps=2.766e+07u
-M1001 a_47_367# B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.4112e+12p ps=1.232e+07u
-M1002 Y B a_47_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=1.8816e+12p pd=1.792e+07u as=2.1e+12p ps=2.012e+07u
-M1004 VPWR A a_47_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_47_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_47_367# B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_47_367# B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A a_47_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_47_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B a_47_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_47_367# B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_47_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y B a_47_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_47_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y B a_47_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_47_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_47_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_47_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_47_367# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_47_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_47_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 Y B a_47_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 Y B a_47_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_47_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 VPWR A a_47_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 Y B a_47_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_47_367# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 Y B a_47_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 VPWR A a_47_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 VPWR A a_47_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 a_47_367# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 a_47_367# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_lp.cdl b/cells/nor2/sky130_fd_sc_lp__nor2_lp.cdl
index f296d00..4f782de 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_lp.cdl
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_lp.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__nor2_lp 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net43 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
-MMN0 Y 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
-MI7 net43 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 Y 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
-MI8 net35 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net35 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
 .ENDS sky130_fd_sc_lp__nor2_lp
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_lp.netlist.tsv b/cells/nor2/sky130_fd_sc_lp__nor2_lp.netlist.tsv
index b20f413..005dd25 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_lp.netlist.tsv
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_lp.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__nor2_lp	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	net43	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net43	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	net35	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net35	B	VGND	VNB	nshort	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	net43	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net43	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	net35	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net35	B	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/nor2/sky130_fd_sc_lp__nor2_lp.spice b/cells/nor2/sky130_fd_sc_lp__nor2_lp.spice
index 77fb1e2..a35a5b4 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_lp.spice
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_lp.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__nor2_lp A B VNB VPB Y
-M1000 a_130_112# A VNB w_0_0# nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.394e+11p ps=2.82e+06u
-M1001 VNB B a_294_112# w_0_0# nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1002 Y A a_130_112# w_0_0# nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1003 a_294_112# B Y w_0_0# nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_130_490# A VPB w_n38_331# phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1005 Y B a_130_490# w_n38_331# phighvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
+X0 Y B a_294_112# SUBS sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_294_112# B VNB SUBS sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VNB A a_130_112# SUBS sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_130_490# B Y w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_130_112# A Y SUBS sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPB A a_130_490# w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_lp2.cdl b/cells/nor2/sky130_fd_sc_lp__nor2_lp2.cdl
index 1698421..615daea 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_lp2.cdl
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_lp2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__nor2_lp2 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.0 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A 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
+MMP1 sndPA B 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
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
+MI7 net43 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
-MMN0 Y 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
-MI7 net43 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 Y 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
-MI8 net35 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net35 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
 .ENDS sky130_fd_sc_lp__nor2_lp2
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_lp2.netlist.tsv b/cells/nor2/sky130_fd_sc_lp__nor2_lp2.netlist.tsv
index db0d213..1f0c660 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_lp2.netlist.tsv
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_lp2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__nor2_lp2	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.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	net43	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net43	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	net35	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net35	B	VGND	VNB	nshort	1	0.42	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.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	net43	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net43	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	net35	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net35	B	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/nor2/sky130_fd_sc_lp__nor2_lp2.spice b/cells/nor2/sky130_fd_sc_lp__nor2_lp2.spice
index 043e6d1..91e16d4 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_lp2.spice
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_lp2.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__nor2_lp2 A B VGND VNB VPB VPWR Y
-M1000 a_130_112# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.394e+11p ps=2.82e+06u
-M1001 VGND B a_294_112# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1002 Y A a_130_112# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1003 a_294_112# B Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B a_134_374# VPB phighvt w=1e+06u l=250000u
-+  ad=2.65e+11p pd=2.53e+06u as=2.1e+11p ps=2.42e+06u
-M1005 a_134_374# A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
+X0 Y B a_294_112# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_134_374# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_294_112# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND A a_130_112# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_130_112# A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR A a_134_374# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_m.cdl b/cells/nor2/sky130_fd_sc_lp__nor2_m.cdl
index 8f4cef3..9e490e7 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_m.cdl
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_m.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__nor2_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y 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
-MMN1 Y 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
 .ENDS sky130_fd_sc_lp__nor2_m
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_m.netlist.tsv b/cells/nor2/sky130_fd_sc_lp__nor2_m.netlist.tsv
index dcde419..06a147f 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_m.netlist.tsv
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_m.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__nor2_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	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/nor2/sky130_fd_sc_lp__nor2_m.spice b/cells/nor2/sky130_fd_sc_lp__nor2_m.spice
index 16da749..3f65d55 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_m.spice
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_m.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__nor2_m A B VGND VNB VPB VPWR Y
-M1000 VGND B Y VNB nshort w=420000u l=150000u
-+  ad=2.226e+11p pd=2.74e+06u as=1.176e+11p ps=1.4e+06u
-M1001 a_120_483# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.113e+11p ps=1.37e+06u
-M1002 Y B a_120_483# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1003 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_120_483# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_120_483# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_1.cdl b/cells/nor2b/sky130_fd_sc_lp__nor2b_1.cdl
index 39f1ff6..c957811 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_1.cdl
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.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 phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor2b_1
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_1.netlist.tsv b/cells/nor2b/sky130_fd_sc_lp__nor2b_1.netlist.tsv
index 27ebb52..1159f7e 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_1.netlist.tsv
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.42	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.26	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.26	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_1.spice b/cells/nor2b/sky130_fd_sc_lp__nor2b_1.spice
index dca3dc7..b13c351 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_1.spice
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__nor2b_1 A B_N VGND VNB VPB VPWR Y
-M1000 Y a_79_47# a_283_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.174e+11p pd=3.5e+06u as=2.646e+11p ps=2.94e+06u
-M1001 VGND a_79_47# Y VNB nshort w=840000u l=150000u
-+  ad=5.334e+11p pd=4.8e+06u as=2.352e+11p ps=2.24e+06u
-M1002 VGND B_N a_79_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1003 VPWR B_N a_79_47# VPB phighvt w=420000u l=150000u
-+  ad=3.864e+11p pd=3.3e+06u as=1.113e+11p ps=1.37e+06u
-M1004 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_283_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_283_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_283_367# a_79_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_79_47# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_79_47# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 Y a_79_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_2.cdl b/cells/nor2b/sky130_fd_sc_lp__nor2b_2.cdl
index 4a7cca7..483ed48 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_2.cdl
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=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 sndPA B VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 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 phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort 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
-MMN1 Y B VNB nshort 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
-MMIN1 B B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor2b_2
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_2.netlist.tsv b/cells/nor2b/sky130_fd_sc_lp__nor2b_2.netlist.tsv
index fe14f62..e3ee97e 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_2.netlist.tsv
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.42	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.26	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.26	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	2	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_2.spice b/cells/nor2b/sky130_fd_sc_lp__nor2b_2.spice
index aac2750..1ef1889 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_2.spice
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__nor2b_2 A B_N VGND VNB VPB VPWR Y
-M1000 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=1.0038e+12p pd=7.52e+06u as=4.704e+11p ps=4.48e+06u
-M1001 VGND B_N a_40_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1002 a_283_367# a_40_131# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=3.528e+11p ps=3.08e+06u
-M1003 VPWR B_N a_40_131# VPB phighvt w=420000u l=150000u
-+  ad=7.14e+11p pd=6.32e+06u as=1.113e+11p ps=1.37e+06u
-M1004 VGND a_40_131# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y a_40_131# a_283_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y a_40_131# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A a_283_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_283_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_40_131# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_283_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_283_367# a_40_131# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR A a_283_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Y a_40_131# a_283_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_40_131# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_40_131# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 Y a_40_131# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_4.cdl b/cells/nor2b/sky130_fd_sc_lp__nor2b_4.cdl
index 94dbc10..5088949 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_4.cdl
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.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 phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=4 w=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 phighvt m=1 w=1.26 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor2b_4
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_4.netlist.tsv b/cells/nor2b/sky130_fd_sc_lp__nor2b_4.netlist.tsv
index 43f07b0..65b32e6 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_4.netlist.tsv
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	4	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_4.spice b/cells/nor2b/sky130_fd_sc_lp__nor2b_4.spice
index 1b6f59d..4662fc3 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_4.spice
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_lp__nor2b_4 A B_N VGND VNB VPB VPWR Y
-M1000 a_245_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=1.1403e+12p ps=9.37e+06u
-M1001 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=1.2306e+12p pd=1.133e+07u as=9.408e+11p ps=8.96e+06u
-M1002 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_245_367# a_60_47# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1004 Y a_60_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A a_245_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_60_47# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y a_60_47# a_245_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y a_60_47# a_245_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y a_60_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_245_367# a_60_47# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND B_N a_60_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1013 VPWR B_N a_60_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1014 a_245_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A a_245_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_60_47# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_245_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 Y a_60_47# a_245_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_60_47# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 Y a_60_47# a_245_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VPWR A a_245_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND a_60_47# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VPWR A a_245_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_245_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_60_47# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_245_367# a_60_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 Y a_60_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_245_367# a_60_47# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 Y a_60_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 VGND a_60_47# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.cdl b/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.cdl
index 9de8483..ad192cf 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.cdl
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.cdl
@@ -16,22 +16,22 @@
 
 .SUBCKT sky130_fd_sc_lp__nor2b_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A 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
-MMP1 sndPA B VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B 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
-MMIP1 B B_N VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIP1 B B_N 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
-MMN0 Y 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
-MMN1 Y 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
-MMIN1 B B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net39 B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net46 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net31 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI5 net39 B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net46 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
+MI6 net31 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor2b_lp
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.netlist.tsv b/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.netlist.tsv
index a33bad6..e5d0129 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.netlist.tsv
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.netlist.tsv
@@ -1,11 +1,11 @@
 sky130_fd_sc_lp__nor2b_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	net31	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	net46	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	net39	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net39	B_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net46	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net31	A	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	Y	VPB	pfet_01v8_hvt	1	1	0.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	net31	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	net46	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	net39	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net39	B_N	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net46	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net31	A	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/nor2b/sky130_fd_sc_lp__nor2b_lp.spice b/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.spice
index c55b65a..fe68e32 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.spice
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.spice
@@ -16,22 +16,13 @@
 
 
 .subckt sky130_fd_sc_lp__nor2b_lp A B_N VGND VNB VPB VPWR Y
-M1000 a_195_57# A VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.373e+11p ps=2.81e+06u
-M1001 Y A a_195_57# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1002 VGND a_303_300# a_353_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1003 a_303_300# B_N VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=5.7e+11p ps=5.14e+06u
-M1004 a_255_408# A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1005 a_353_57# a_303_300# Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_511_57# B_N VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1007 a_303_300# B_N a_511_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1008 Y a_303_300# a_255_408# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
+X0 a_511_57# B_N a_303_300# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR B_N a_303_300# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_195_57# A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y a_303_300# a_353_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_353_57# a_303_300# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND B_N a_511_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR A a_255_408# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 VGND A a_195_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_255_408# a_303_300# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_m.cdl b/cells/nor2b/sky130_fd_sc_lp__nor2b_m.cdl
index aa8f2e5..2821031 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_m.cdl
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_m.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__nor2b_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor2b_m
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_m.netlist.tsv b/cells/nor2b/sky130_fd_sc_lp__nor2b_m.netlist.tsv
index 36c04f7..78f2033 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_m.netlist.tsv
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_m.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__nor2b_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.42	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_m.spice b/cells/nor2b/sky130_fd_sc_lp__nor2b_m.spice
index b15a79a..57d70fe 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_m.spice
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_m.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__nor2b_m A B_N VGND VNB VPB VPWR Y
-M1000 Y a_47_70# a_328_492# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1001 a_328_492# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.827e+11p ps=1.71e+06u
-M1002 VGND a_47_70# Y VNB nshort w=420000u l=150000u
-+  ad=3.549e+11p pd=3.37e+06u as=1.176e+11p ps=1.4e+06u
-M1003 VGND B_N a_47_70# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 VPWR B_N a_47_70# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1005 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_328_492# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 Y a_47_70# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_328_492# a_47_70# Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_47_70# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_47_70# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_0.cdl b/cells/nor3/sky130_fd_sc_lp__nor3_0.cdl
index 53c47df..b4bbb14 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_0.cdl
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_0.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__nor3_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A 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
+MMP1 sndPA 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
+MMP2 sndPB 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
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y 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
-MMN1 Y 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
-MMN2 Y 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
 .ENDS sky130_fd_sc_lp__nor3_0
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_0.netlist.tsv b/cells/nor3/sky130_fd_sc_lp__nor3_0.netlist.tsv
index cbedf2c..7e78656 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_0.netlist.tsv
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_0.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__nor3_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	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/nor3/sky130_fd_sc_lp__nor3_0.spice b/cells/nor3/sky130_fd_sc_lp__nor3_0.spice
index decd91c..64942ea 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_0.spice
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_0.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__nor3_0 A B C VGND VNB VPB VPWR Y
-M1000 a_123_483# A VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.696e+11p ps=1.81e+06u
-M1001 VGND B Y VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=2.289e+11p ps=2.77e+06u
-M1002 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_201_483# B a_123_483# VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1004 Y C VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y C a_201_483# VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
+X0 a_123_483# B a_201_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_201_483# C Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 VPWR A a_123_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_1.cdl b/cells/nor3/sky130_fd_sc_lp__nor3_1.cdl
index 8c1f456..0c69367 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_1.cdl
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.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 phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor3_1
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_1.netlist.tsv b/cells/nor3/sky130_fd_sc_lp__nor3_1.netlist.tsv
index dab4ce8..f8d844c 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_1.netlist.tsv
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_1.spice b/cells/nor3/sky130_fd_sc_lp__nor3_1.spice
index 47debb6..7214d69 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_1.spice
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__nor3_1 A B C VGND VNB VPB VPWR Y
-M1000 Y C a_202_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=3.654e+11p ps=3.1e+06u
-M1001 Y C VGND VNB nshort w=840000u l=150000u
-+  ad=4.578e+11p pd=4.45e+06u as=4.914e+11p ps=4.53e+06u
-M1002 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_202_367# B a_110_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.906e+11p ps=3.14e+06u
-M1005 a_110_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 a_202_367# C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VPWR A a_110_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_110_367# B a_202_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_2.cdl b/cells/nor3/sky130_fd_sc_lp__nor3_2.cdl
index ed06229..918d5eb 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_2.cdl
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.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 phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 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 sndPB C VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 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.84 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.84 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.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_lp__nor3_2
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_2.netlist.tsv b/cells/nor3/sky130_fd_sc_lp__nor3_2.netlist.tsv
index da05888..ddb8010 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_2.netlist.tsv
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_2.spice b/cells/nor3/sky130_fd_sc_lp__nor3_2.spice
index ffb8a27..3a307de 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_2.spice
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__nor3_2 A B C VGND VNB VPB VPWR Y
-M1000 VPWR A a_36_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.875e+11p pd=3.77e+06u as=1.0206e+12p ps=9.18e+06u
-M1001 Y C a_360_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=1.1466e+12p ps=6.86e+06u
-M1002 a_36_367# B a_360_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND C Y VNB nshort w=840000u l=150000u
-+  ad=9.156e+11p pd=8.9e+06u as=7.644e+11p ps=6.86e+06u
-M1004 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_360_367# B a_36_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y C VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_360_367# C Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_36_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_36_367# B a_360_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 Y C a_360_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_360_367# B a_36_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_36_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR A a_36_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_360_367# C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_4.cdl b/cells/nor3/sky130_fd_sc_lp__nor3_4.cdl
index 965ede3..d20746b 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_4.cdl
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.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 phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=4 w=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 sndPB C VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=4 w=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.84 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.84 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.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_lp__nor3_4
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_4.netlist.tsv b/cells/nor3/sky130_fd_sc_lp__nor3_4.netlist.tsv
index 5fbe63c..9a31a58 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_4.netlist.tsv
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_4.spice b/cells/nor3/sky130_fd_sc_lp__nor3_4.spice
index 8832ddd..67e9617 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_4.spice
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_lp__nor3_4 A B C VGND VNB VPB VPWR Y
-M1000 a_456_367# B a_29_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=1.7514e+12p ps=1.538e+07u
-M1001 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=1.6212e+12p pd=1.562e+07u as=1.4112e+12p ps=1.344e+07u
-M1002 a_29_367# B a_456_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_456_367# B a_29_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_456_367# C Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1005 VGND C Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_29_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1007 VGND C Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_29_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_456_367# C Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y C VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y C a_456_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y C VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_29_367# B a_456_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A a_29_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A a_29_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y C a_456_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_456_367# C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_456_367# B a_29_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 Y C a_456_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPWR A a_29_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 Y C a_456_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_29_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_29_367# B a_456_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_29_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 a_29_367# B a_456_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 a_456_367# C Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 VPWR A a_29_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 a_456_367# B a_29_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_lp.cdl b/cells/nor3/sky130_fd_sc_lp__nor3_lp.cdl
index 2bb190a..444794a 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_lp.cdl
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_lp.cdl
@@ -16,22 +16,22 @@
 
 .SUBCKT sky130_fd_sc_lp__nor3_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A 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
-MMP1 sndPA B VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B 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
-MMP2 sndPB C VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C 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
-MMN0 Y 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
-MI8 Y 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
-MI6 net74 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 net61 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 Y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 net66 C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net74 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
-MI7 Y 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
+MMN1 net61 B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMN2 net66 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
+MI7 Y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor3_lp
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_lp.netlist.tsv b/cells/nor3/sky130_fd_sc_lp__nor3_lp.netlist.tsv
index 64fffc3..e5eacfa 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_lp.netlist.tsv
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_lp.netlist.tsv
@@ -1,11 +1,11 @@
 sky130_fd_sc_lp__nor3_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	net74	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Y	C	net66	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net74	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	net61	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	net66	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	Y	B	net61	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	net74	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Y	C	net66	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net74	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	net61	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	net66	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	Y	B	net61	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_lp.spice b/cells/nor3/sky130_fd_sc_lp__nor3_lp.spice
index c4db88c..1ca4412 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_lp.spice
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_lp.spice
@@ -16,22 +16,13 @@
 
 
 .subckt sky130_fd_sc_lp__nor3_lp A B C VGND VNB VPB VPWR Y
-M1000 a_173_57# C Y VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.373e+11p ps=2.81e+06u
-M1001 a_297_409# C Y VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=2.85e+11p ps=2.57e+06u
-M1002 VGND C a_173_57# VNB nshort w=420000u l=150000u
-+  ad=2.373e+11p pd=2.81e+06u as=0p ps=0u
-M1003 Y B a_331_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1004 VPWR A a_395_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=3.2e+11p ps=2.64e+06u
-M1005 a_395_409# B a_297_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_331_57# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A a_489_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1008 a_489_57# A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_395_409# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_489_57# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_173_57# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND B a_331_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_331_57# B Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 Y C a_297_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 Y C a_173_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_297_409# B a_395_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 Y A a_489_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_m.cdl b/cells/nor3/sky130_fd_sc_lp__nor3_m.cdl
index d54f34a..7e25a49 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_m.cdl
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_m.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__nor3_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y 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
-MMN1 Y 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
-MMN2 Y 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
 .ENDS sky130_fd_sc_lp__nor3_m
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_m.netlist.tsv b/cells/nor3/sky130_fd_sc_lp__nor3_m.netlist.tsv
index c76eefd..5551ea6 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_m.netlist.tsv
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_m.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__nor3_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	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/nor3/sky130_fd_sc_lp__nor3_m.spice b/cells/nor3/sky130_fd_sc_lp__nor3_m.spice
index 9cf107d..9ccfdb5 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_m.spice
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_m.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__nor3_m A B C VGND VNB VPB VPWR Y
-M1000 a_123_483# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.26e+11p ps=1.44e+06u
-M1001 VGND B Y VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=2.289e+11p ps=2.77e+06u
-M1002 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_201_483# B a_123_483# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1004 Y C VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y C a_201_483# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 a_123_483# B a_201_483# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_201_483# C Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VPWR A a_123_483# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_1.cdl b/cells/nor3b/sky130_fd_sc_lp__nor3b_1.cdl
index 03123eb..e1f378a 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_1.cdl
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.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 phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor3b_1
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_1.netlist.tsv b/cells/nor3b/sky130_fd_sc_lp__nor3b_1.netlist.tsv
index c9d5f26..c6aef1d 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_1.netlist.tsv
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.42	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.26	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.26	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.26	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_1.spice b/cells/nor3b/sky130_fd_sc_lp__nor3b_1.spice
index ecdddb1..68366c2 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_1.spice
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__nor3b_1 A B C_N VGND VNB VPB VPWR Y
-M1000 VGND C_N a_82_131# VNB nshort w=420000u l=150000u
-+  ad=5.187e+11p pd=4.73e+06u as=1.113e+11p ps=1.37e+06u
-M1001 Y a_82_131# a_347_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=4.914e+11p ps=3.3e+06u
-M1002 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=4.872e+11p pd=4.52e+06u as=0p ps=0u
-M1003 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR C_N a_82_131# VPB phighvt w=420000u l=150000u
-+  ad=3.906e+11p pd=3.32e+06u as=1.113e+11p ps=1.37e+06u
-M1005 Y a_82_131# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_275_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1007 a_347_367# B a_275_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_82_131# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_347_367# a_82_131# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_82_131# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VPWR A a_275_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_275_367# B a_347_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VGND a_82_131# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_2.cdl b/cells/nor3b/sky130_fd_sc_lp__nor3b_2.cdl
index ea2c395..8a8953c 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_2.cdl
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=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 sndPA B VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 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 sndPB C VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 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 C C_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort 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
-MMN1 Y B VNB nshort 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
-MMN2 Y C VNB nshort 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
-MMIN2 C C_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor3b_2
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_2.netlist.tsv b/cells/nor3b/sky130_fd_sc_lp__nor3b_2.netlist.tsv
index ba9fece..f9465e8 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_2.netlist.tsv
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.42	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.26	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.26	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.26	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	2	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_2.spice b/cells/nor3b/sky130_fd_sc_lp__nor3b_2.spice
index 24b9767..5d85a38 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_2.spice
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__nor3b_2 A B C_N VGND VNB VPB VPWR Y
-M1000 VGND a_27_131# Y VNB nshort w=840000u l=150000u
-+  ad=1.2411e+12p pd=1.027e+07u as=7.938e+11p ps=6.93e+06u
-M1001 VPWR C_N a_27_131# VPB phighvt w=420000u l=150000u
-+  ad=7.791e+11p pd=7.47e+06u as=1.113e+11p ps=1.37e+06u
-M1002 a_472_365# B a_217_365# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=1.0206e+12p ps=9.18e+06u
-M1003 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y a_27_131# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_217_365# a_27_131# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1007 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A a_472_365# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_27_131# a_217_365# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_217_365# B a_472_365# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND C_N a_27_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1013 a_472_365# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 Y a_27_131# a_217_365# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_217_365# a_27_131# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND a_27_131# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_472_365# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VPWR A a_472_365# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_472_365# B a_217_365# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_217_365# B a_472_365# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_27_131# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 a_27_131# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 Y a_27_131# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_4.cdl b/cells/nor3b/sky130_fd_sc_lp__nor3b_4.cdl
index 95aa5ca..020d9fd 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_4.cdl
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 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.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 phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=4 w=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 sndPB C VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=4 w=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 C C_N VPB phighvt m=1 w=1.26 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.84 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor3b_4
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_4.netlist.tsv b/cells/nor3b/sky130_fd_sc_lp__nor3b_4.netlist.tsv
index 8099430..12a72e3 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_4.netlist.tsv
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	4	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_4.spice b/cells/nor3b/sky130_fd_sc_lp__nor3b_4.spice
index f9f2886..f9e6f6b 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_4.spice
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_4.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_lp__nor3b_4 A B C_N VGND VNB VPB VPWR Y
-M1000 a_576_367# B a_211_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7262e+12p pd=1.534e+07u as=1.4112e+12p ps=1.232e+07u
-M1001 a_211_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.0395e+12p ps=9.21e+06u
-M1002 VGND a_38_367# Y VNB nshort w=840000u l=150000u
-+  ad=1.8774e+12p pd=1.623e+07u as=1.4112e+12p ps=1.344e+07u
-M1003 VGND a_38_367# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y a_38_367# a_576_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1007 VGND C_N a_38_367# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1008 a_211_367# B a_576_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y a_38_367# a_576_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_211_367# B a_576_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR C_N a_38_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.591e+11p ps=3.09e+06u
-M1014 VPWR A a_211_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y a_38_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_576_367# a_38_367# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_211_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR A a_211_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y a_38_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_576_367# a_38_367# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_576_367# B a_211_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VGND a_38_367# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_38_367# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 Y a_38_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_211_367# B a_576_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND a_38_367# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_38_367# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_576_367# a_38_367# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 Y a_38_367# a_576_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_211_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 VPWR A a_211_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_576_367# B a_211_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 Y a_38_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 a_576_367# B a_211_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 Y a_38_367# a_576_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 a_211_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 VPWR A a_211_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 a_211_367# B a_576_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 a_576_367# a_38_367# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.cdl b/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.cdl
index 5b9658c..8fa9c92 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.cdl
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__nor3b_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A 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
-MMP1 sndPA B VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B 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
-MMP2 sndPB C VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C 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 C C_N VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIP2 C C_N 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
-MMN0 Y 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
-MMN1 net76 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 net89 C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 net76 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
-MI7 net96 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 net89 C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net96 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
-MI8 Y 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
-MI6 net80 C_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 Y 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
+MI8 Y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net80 C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 Y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor3b_lp
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.netlist.tsv b/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.netlist.tsv
index 7701593..50205d8 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.netlist.tsv
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__nor3b_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	net96	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	net76	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	net89	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net96	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	net80	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	Y	B	net76	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net80	C_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Y	C	net89	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8_hvt	1	1	0.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	net96	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	net76	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	net89	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net96	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	net80	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	Y	B	net76	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net80	C_N	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Y	C	net89	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.spice b/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.spice
index cbfa08c..a9c8c22 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.spice
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__nor3b_lp A B C_N VGND VNB VPB VPWR Y
-M1000 Y a_350_269# a_286_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=3.2e+11p ps=2.64e+06u
-M1001 a_136_57# A Y VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.373e+11p ps=2.81e+06u
-M1002 a_294_57# B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.352e+11p ps=2.8e+06u
-M1003 a_286_409# B a_188_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1004 Y B a_294_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_350_269# a_452_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1006 a_350_269# C_N VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=5.7e+11p ps=5.14e+06u
-M1007 a_452_57# a_350_269# Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_610_57# C_N VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1009 a_350_269# C_N a_610_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1010 a_188_409# A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A a_136_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_610_57# C_N a_350_269# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_286_409# a_350_269# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_294_57# B Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y a_350_269# a_452_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_452_57# a_350_269# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR C_N a_350_269# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 VGND C_N a_610_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 Y A a_136_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_136_57# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR A a_188_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 VGND B a_294_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_188_409# B a_286_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_m.cdl b/cells/nor3b/sky130_fd_sc_lp__nor3b_m.cdl
index 78350aa..7dd8299 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_m.cdl
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_m.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__nor3b_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=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 C C_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor3b_m
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_m.netlist.tsv b/cells/nor3b/sky130_fd_sc_lp__nor3b_m.netlist.tsv
index 9637a62..e83776c 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_m.netlist.tsv
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_m.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__nor3b_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	Y	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_m.spice b/cells/nor3b/sky130_fd_sc_lp__nor3b_m.spice
index bb4ab2e..6dfc940 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_m.spice
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_m.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__nor3b_m A B C_N VGND VNB VPB VPWR Y
-M1000 a_218_439# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.638e+11p ps=1.62e+06u
-M1001 a_290_439# B a_218_439# VPB phighvt w=420000u l=150000u
-+  ad=1.554e+11p pd=1.58e+06u as=0p ps=0u
-M1002 Y a_27_439# VGND VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=2.352e+11p ps=2.8e+06u
-M1003 VGND C_N a_27_439# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR C_N a_27_439# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 VGND B Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y a_27_439# a_290_439# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 a_27_439# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_290_439# a_27_439# Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_27_439# Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR A a_218_439# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_27_439# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_218_439# B a_290_439# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_0.cdl b/cells/nor4/sky130_fd_sc_lp__nor4_0.cdl
index b85b1ff..61d88c8 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_0.cdl
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_0.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__nor4_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A 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.028 perim=0.76
+MMP1 sndPA 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.028 perim=0.76
+MMP2 sndPB 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.028 perim=0.76
+MMP3 sndPC 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.028 perim=0.76
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP1 sndPA B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP2 sndPB C VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP3 sndPC D VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN0 Y 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.028 perim=0.76
-MMN1 Y 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.028 perim=0.76
-MMN2 Y 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.028 perim=0.76
-MMN3 Y 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.028 perim=0.76
 .ENDS sky130_fd_sc_lp__nor4_0
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_0.netlist.tsv b/cells/nor4/sky130_fd_sc_lp__nor4_0.netlist.tsv
index 9ea3e7b..e2fe129 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_0.netlist.tsv
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_0.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__nor4_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_0.spice b/cells/nor4/sky130_fd_sc_lp__nor4_0.spice
index 4405f0c..e5a12e7 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_0.spice
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_0.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__nor4_0 A B C D VGND VNB VPB VPWR Y
-M1000 a_330_483# C a_252_483# VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.536e+11p ps=1.76e+06u
-M1001 VGND D Y VNB nshort w=420000u l=150000u
-+  ad=4.872e+11p pd=4.84e+06u as=2.352e+11p ps=2.8e+06u
-M1002 Y D a_330_483# VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1003 a_174_483# A VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.696e+11p ps=1.81e+06u
-M1004 Y C VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_252_483# B a_174_483# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_252_483# C a_330_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_174_483# B a_252_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_330_483# D Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 VPWR A a_174_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_1.cdl b/cells/nor4/sky130_fd_sc_lp__nor4_1.cdl
index abc9fdc..2e4675f 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_1.cdl
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP2 sndPB C VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP3 sndPC D VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN0 Y A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN1 Y B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN2 Y C VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
-MMN3 Y D VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.028 perim=0.76
 .ENDS sky130_fd_sc_lp__nor4_1
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_1.netlist.tsv b/cells/nor4/sky130_fd_sc_lp__nor4_1.netlist.tsv
index 76bfd33..c171087 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_1.netlist.tsv
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_1.spice b/cells/nor4/sky130_fd_sc_lp__nor4_1.spice
index 5fe3b77..480bdd8 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_1.spice
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__nor4_1 A B C D VGND VNB VPB VPWR Y
-M1000 VGND D Y VNB nshort w=840000u l=150000u
-+  ad=8.652e+11p pd=7.1e+06u as=4.704e+11p ps=4.48e+06u
-M1001 Y D a_304_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=4.914e+11p ps=3.3e+06u
-M1002 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_206_367# B a_110_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.284e+11p pd=3.2e+06u as=4.158e+11p ps=3.18e+06u
-M1004 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y C VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_304_367# C a_206_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_110_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 a_110_367# B a_206_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_304_367# D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_206_367# C a_304_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR A a_110_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 Y D VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_2.cdl b/cells/nor4/sky130_fd_sc_lp__nor4_2.cdl
index cc363da..dd3b365 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_2.cdl
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=2 w=0.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=2 w=0.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 m=2 w=0.84 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.84 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.84 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.84 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.84 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_lp__nor4_2
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_2.netlist.tsv b/cells/nor4/sky130_fd_sc_lp__nor4_2.netlist.tsv
index a060450..ad8a004 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_2.netlist.tsv
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_2.spice b/cells/nor4/sky130_fd_sc_lp__nor4_2.spice
index 5044e32..32f9afc 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_2.spice
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__nor4_2 A B C D VGND VNB VPB VPWR Y
-M1000 VPWR A a_157_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=7.056e+11p ps=6.16e+06u
-M1001 a_74_367# C a_553_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.3482e+12p pd=9.7e+06u as=7.056e+11p ps=6.16e+06u
-M1002 Y D VGND VNB nshort w=840000u l=150000u
-+  ad=9.408e+11p pd=8.96e+06u as=1.3104e+12p ps=1.152e+07u
-M1003 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_157_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y D a_553_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1007 a_157_367# B a_74_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_553_367# D Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_553_367# C a_74_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND C Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y C VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND D Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_74_367# B a_157_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_157_367# B a_74_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_74_367# B a_157_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 Y D VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VGND D Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_157_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 Y D a_553_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_553_367# D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_553_367# C a_74_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VPWR A a_157_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_74_367# C a_553_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_4.cdl b/cells/nor4/sky130_fd_sc_lp__nor4_4.cdl
index fc4a856..2360994 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_4.cdl
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 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=4 w=0.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=4 w=0.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=4 w=0.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 m=4 w=0.84 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=4 w=0.84 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=4 w=0.84 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=4 w=0.84 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=4 w=0.84 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_lp__nor4_4
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_4.netlist.tsv b/cells/nor4/sky130_fd_sc_lp__nor4_4.netlist.tsv
index 7de8e72..02977bb 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_4.netlist.tsv
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_4.spice b/cells/nor4/sky130_fd_sc_lp__nor4_4.spice
index da1efb3..c455d7c 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_4.spice
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_lp__nor4_4 A B C D VGND VNB VPB VPWR Y
-M1000 Y D a_864_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=1.7262e+12p ps=1.534e+07u
-M1001 a_864_367# D Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_72_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7262e+12p pd=1.534e+07u as=7.056e+11p ps=6.16e+06u
-M1003 a_499_367# C a_864_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=0p ps=0u
-M1004 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=1.8816e+12p pd=1.792e+07u as=2.4696e+12p ps=2.1e+07u
-M1005 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_72_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y C VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y D a_864_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_72_367# B a_499_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_864_367# C a_499_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND D Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A a_72_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND D Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_864_367# C a_499_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND C Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_72_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_72_367# B a_499_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_864_367# D Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_499_367# B a_72_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y C VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_499_367# C a_864_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y D VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y D VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND C Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_499_367# B a_72_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_72_367# B a_499_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR A a_72_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_72_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 Y D a_864_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_499_367# C a_864_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_864_367# D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_864_367# C a_499_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VGND D Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_499_367# B a_72_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VPWR A a_72_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 Y D a_864_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_864_367# D Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 a_499_367# B a_72_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 a_72_367# B a_499_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 Y D VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 VGND D Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 a_864_367# C a_499_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 a_72_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X30 Y D VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X31 a_499_367# C a_864_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_lp.cdl b/cells/nor4/sky130_fd_sc_lp__nor4_lp.cdl
index 02cdd21..16bfe2c 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_lp.cdl
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_lp.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__nor4_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A 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.028 perim=0.76
-MMP1 sndPA B VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B 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.028 perim=0.76
-MMP2 sndPB C VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C 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.028 perim=0.76
-MMP3 sndPC D VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D 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.028 perim=0.76
-MMN0 Y 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.028 perim=0.76
-MMN1 Y 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.028 perim=0.76
-MMN2 Y 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.028 perim=0.76
-MI10 Y 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.028 perim=0.76
-MMN3 net53 D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MI9 net49 C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MI7 net45 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MI8 net41 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI10 Y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.028 perim=0.76
+MMN3 net53 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.028 perim=0.76
+MI9 net49 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.028 perim=0.76
+MI7 net45 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.028 perim=0.76
+MI8 net41 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.028 perim=0.76
 .ENDS sky130_fd_sc_lp__nor4_lp
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_lp.netlist.tsv b/cells/nor4/sky130_fd_sc_lp__nor4_lp.netlist.tsv
index 34978e1..34616ad 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_lp.netlist.tsv
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_lp.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__nor4_lp	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	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN0	MOSFET	Y	A	net45	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN1	MOSFET	Y	B	net41	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN2	MOSFET	Y	C	net49	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MI10	MOSFET	Y	D	net53	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN3	MOSFET	net53	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MI9	MOSFET	net49	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MI7	MOSFET	net45	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MI8	MOSFET	net41	B	VGND	VNB	nshort	1	0.42	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	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN0	MOSFET	Y	A	net45	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN1	MOSFET	Y	B	net41	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN2	MOSFET	Y	C	net49	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MI10	MOSFET	Y	D	net53	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN3	MOSFET	net53	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MI9	MOSFET	net49	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MI7	MOSFET	net45	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MI8	MOSFET	net41	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_lp.spice b/cells/nor4/sky130_fd_sc_lp__nor4_lp.spice
index 8cddd23..da9bf01 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_lp.spice
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_lp.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__nor4_lp A B C D VGND VNB VPB VPWR Y
-M1000 a_27_409# D Y VPB phighvt w=1e+06u l=250000u
-+  ad=5.7e+11p pd=5.14e+06u as=2.85e+11p ps=2.57e+06u
-M1001 Y C a_138_57# VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=8.82e+10p ps=1.26e+06u
-M1002 a_454_57# B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.57e+11p ps=4.22e+06u
-M1003 a_612_57# A Y VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 VGND A a_612_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_134_409# C a_27_409# VPB phighvt w=1e+06u l=250000u
-+  ad=5.7e+11p pd=5.14e+06u as=0p ps=0u
-M1006 a_570_409# B a_134_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1007 a_138_57# C VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_296_57# D Y VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1009 VGND D a_296_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B a_454_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A a_570_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
+X0 a_454_57# B Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 Y A a_612_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND C a_138_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y D a_296_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_27_409# C a_134_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_570_409# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_134_409# B a_570_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_612_57# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_296_57# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND B a_454_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 Y D a_27_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 a_138_57# C Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_m.cdl b/cells/nor4/sky130_fd_sc_lp__nor4_m.cdl
index af0e5e9..9aec2b6 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_m.cdl
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_m.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__nor4_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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.028 perim=0.76
+MMP1 sndPA 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.028 perim=0.76
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP2 sndPB C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMP3 sndPC D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.028 perim=0.76
-MMN0 Y 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.028 perim=0.76
-MMN1 Y 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.028 perim=0.76
-MMN2 Y 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.028 perim=0.76
-MMN3 Y 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.028 perim=0.76
 .ENDS sky130_fd_sc_lp__nor4_m
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_m.netlist.tsv b/cells/nor4/sky130_fd_sc_lp__nor4_m.netlist.tsv
index 00bf54a..fab0af3 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_m.netlist.tsv
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_m.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__nor4_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.028	0.76
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_m.spice b/cells/nor4/sky130_fd_sc_lp__nor4_m.spice
index 35e40ce..94f4a98 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_m.spice
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_m.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__nor4_m A B C D VGND VNB VPB VPWR Y
-M1000 a_330_483# C a_252_483# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.008e+11p ps=1.32e+06u
-M1001 Y D a_330_483# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1002 a_174_483# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.113e+11p ps=1.37e+06u
-M1003 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=4.62e+11p ps=4.72e+06u
-M1004 VGND B Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_252_483# B a_174_483# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y C VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND D Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_252_483# C a_330_483# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_174_483# B a_252_483# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_330_483# D Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VPWR A a_174_483# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_1.cdl b/cells/nor4b/sky130_fd_sc_lp__nor4b_1.cdl
index 65d3948..9eb47c6 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_1.cdl
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.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 phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 Y D VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor4b_1
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_1.netlist.tsv b/cells/nor4b/sky130_fd_sc_lp__nor4b_1.netlist.tsv
index a3211af..5fc5831 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_1.netlist.tsv
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.42	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.26	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.26	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.26	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.26	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_1.spice b/cells/nor4b/sky130_fd_sc_lp__nor4b_1.spice
index 4702eb1..a23f0e3 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_1.spice
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__nor4b_1 A B C D_N VGND VNB VPB VPWR Y
-M1000 Y a_80_131# a_451_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.78e+11p pd=3.12e+06u as=4.914e+11p ps=3.3e+06u
-M1001 a_271_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=3.864e+11p ps=3.3e+06u
-M1002 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=8.211e+11p pd=7.12e+06u as=5.082e+11p ps=4.57e+06u
-M1003 a_343_367# B a_271_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.914e+11p pd=3.3e+06u as=0p ps=0u
-M1004 VGND a_80_131# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND D_N a_80_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_451_367# C a_343_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y C VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR D_N a_80_131# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 a_80_131# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_451_367# a_80_131# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 Y a_80_131# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_343_367# C a_451_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VPWR A a_271_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_271_367# B a_343_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_80_131# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_2.cdl b/cells/nor4b/sky130_fd_sc_lp__nor4b_2.cdl
index 2d856cc..7ea4c64 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_2.cdl
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=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 sndPA B VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 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 sndPB C VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 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
-MMP3 sndPC D VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 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 phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort 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
-MMN1 Y B VNB nshort 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
-MMN2 Y C VNB nshort 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
-MMN3 Y D VNB nshort 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
-MMIN3 D D_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor4b_2
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_2.netlist.tsv b/cells/nor4b/sky130_fd_sc_lp__nor4b_2.netlist.tsv
index 1d28e14..133bea6 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_2.netlist.tsv
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.42	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.26	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.26	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.26	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.26	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	2	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_2.spice b/cells/nor4b/sky130_fd_sc_lp__nor4b_2.spice
index ad20b25..f61ffc6 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_2.spice
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_2.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_lp__nor4b_2 A B C D_N VGND VNB VPB VPWR Y
-M1000 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=9.408e+11p pd=8.96e+06u as=1.6716e+12p ps=1.284e+07u
-M1001 a_229_367# B a_672_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.1214e+12p pd=9.34e+06u as=9.954e+11p ps=6.62e+06u
-M1002 Y a_27_535# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y C VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_312_367# a_27_535# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=3.528e+11p ps=3.08e+06u
-M1005 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_672_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=4.641e+11p ps=4.45e+06u
-M1007 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND D_N a_27_535# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1009 VGND C Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y a_27_535# a_312_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR D_N a_27_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1013 VPWR A a_672_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_27_535# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_229_367# C a_312_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_672_367# B a_229_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_312_367# C a_229_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_27_535# a_312_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_27_535# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_27_535# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_672_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_312_367# C a_229_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_672_367# B a_229_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR A a_672_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 Y a_27_535# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_229_367# B a_672_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VGND a_27_535# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_312_367# a_27_535# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_229_367# C a_312_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_4.cdl b/cells/nor4b/sky130_fd_sc_lp__nor4b_4.cdl
index 7d50149..635d4f0 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_4.cdl
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 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.26 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.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 phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=4 w=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 sndPB C VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=4 w=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 sndPC D VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 m=4 w=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 phighvt m=1 w=1.26 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.84 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.84 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor4b_4
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_4.netlist.tsv b/cells/nor4b/sky130_fd_sc_lp__nor4b_4.netlist.tsv
index af7b656..0639f24 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_4.netlist.tsv
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	4	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_4.spice b/cells/nor4b/sky130_fd_sc_lp__nor4b_4.spice
index 2d17a83..b3aefbd 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_4.spice
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_4.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_lp__nor4b_4 A B C D_N VGND VNB VPB VPWR Y
-M1000 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=1.9068e+12p pd=1.798e+07u as=2.9106e+12p ps=2.205e+07u
-M1001 VGND C Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR A a_1009_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0395e+12p pd=9.21e+06u as=1.7262e+12p ps=1.534e+07u
-M1003 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_27_367# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y a_27_367# a_217_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=1.7262e+12p ps=1.534e+07u
-M1006 a_217_367# a_27_367# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_1009_367# B a_644_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.4112e+12p ps=1.232e+07u
-M1008 a_217_367# C a_644_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_27_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1009_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_217_367# C a_644_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1009_367# B a_644_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y C VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y a_27_367# a_217_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_644_367# B a_1009_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1009_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_644_367# C a_217_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_644_367# C a_217_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y a_27_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND C Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_644_367# B a_1009_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND D_N a_27_367# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1028 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND a_27_367# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y C VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_217_367# a_27_367# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR A a_1009_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR D_N a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 a_1009_367# B a_644_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR A a_1009_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VGND a_27_367# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 Y a_27_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 Y a_27_367# a_217_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_217_367# C a_644_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_217_367# a_27_367# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VPWR A a_1009_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 Y a_27_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_1009_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_644_367# B a_1009_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 Y C VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_27_367# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_644_367# C a_217_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 a_217_367# C a_644_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_644_367# C a_217_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 a_27_367# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 a_644_367# B a_1009_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 a_1009_367# B a_644_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X30 Y a_27_367# a_217_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 a_217_367# a_27_367# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X32 VGND a_27_367# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X33 a_1009_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.cdl b/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.cdl
index ad9f954..6212082 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.cdl
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.cdl
@@ -16,34 +16,34 @@
 
 .SUBCKT sky130_fd_sc_lp__nor4b_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A 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
-MMP1 sndPA B VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B 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
-MMP2 sndPB C VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C 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
-MMP3 sndPC D VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D 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
-MMIP3 D D_N VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIP3 D D_N 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
-MMN0 Y 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
-MMN1 net105 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 net80 C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 net105 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
-MMN3 net97 D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 net80 C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 net97 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
-MI8 net108 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 Y 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
-MI10 Y 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
-MI11 Y 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
-MI7 net73 D_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net108 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 Y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 Y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 Y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net73 D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor4b_lp
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.netlist.tsv b/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.netlist.tsv
index fbe4124..12a6e3c 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.netlist.tsv
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.netlist.tsv
@@ -1,17 +1,17 @@
 sky130_fd_sc_lp__nor4b_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	net108	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	net105	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	net80	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	net97	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	net73	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net108	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	Y	B	net105	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	Y	C	net80	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Y	D	net97	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net73	D_N	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	1	1	0.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	net108	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	net105	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	net80	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	net97	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	net73	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net108	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	Y	B	net105	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	Y	C	net80	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Y	D	net97	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net73	D_N	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/nor4b/sky130_fd_sc_lp__nor4b_lp.spice b/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.spice
index 7759e81..7fec807 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.spice
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.spice
@@ -16,34 +16,19 @@
 
 
 .subckt sky130_fd_sc_lp__nor4b_lp A B C D_N VGND VNB VPB VPWR Y
-M1000 a_641_57# B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.906e+11p ps=4.38e+06u
-M1001 VPWR A a_733_409# VPB phighvt w=1e+06u l=250000u
-+  ad=5.7e+11p pd=5.14e+06u as=3.2e+11p ps=2.64e+06u
-M1002 VGND A a_799_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1003 a_466_57# C Y VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.352e+11p ps=2.8e+06u
-M1004 a_733_409# B a_635_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1005 VGND C a_466_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND D_N a_144_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1007 a_799_57# A Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_537_409# a_31_409# Y VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=4e+11p ps=2.8e+06u
-M1009 a_144_57# D_N a_31_409# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1010 Y a_31_409# a_302_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1011 a_302_57# a_31_409# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B a_641_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR D_N a_31_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1014 a_635_409# C a_537_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_31_409# D_N a_144_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_799_57# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 Y C a_466_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_144_57# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_31_409# a_302_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 Y a_31_409# a_537_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 VGND B a_641_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_537_409# C a_635_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_641_57# B Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_31_409# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 a_635_409# B a_733_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 Y A a_799_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_733_409# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X13 a_466_57# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_302_57# a_31_409# Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_m.cdl b/cells/nor4b/sky130_fd_sc_lp__nor4b_m.cdl
index 540318d..027237a 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_m.cdl
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__nor4b_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 Y D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor4b_m
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_m.netlist.tsv b/cells/nor4b/sky130_fd_sc_lp__nor4b_m.netlist.tsv
index 70c054b..a7834ce 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_m.netlist.tsv
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__nor4b_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_m.spice b/cells/nor4b/sky130_fd_sc_lp__nor4b_m.spice
index 2ea26aa..077d944 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_m.spice
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__nor4b_m A B C D_N VGND VNB VPB VPWR Y
-M1000 Y A VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=5.355e+11p ps=5.07e+06u
-M1001 VPWR D_N a_33_68# VPB phighvt w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=1.113e+11p ps=1.37e+06u
-M1002 VGND a_33_68# Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y a_33_68# a_456_496# VPB phighvt w=420000u l=150000u
-+  ad=2.016e+11p pd=1.8e+06u as=8.82e+10p ps=1.26e+06u
-M1004 VGND B Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_312_496# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1006 a_384_496# B a_312_496# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1007 a_456_496# C a_384_496# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND D_N a_33_68# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1009 Y C VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_33_68# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR A a_312_496# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_312_496# B a_384_496# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_384_496# C a_456_496# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_33_68# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_33_68# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_456_496# a_33_68# Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND C Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.cdl b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.cdl
index 6ef24d0..834b5b1 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.cdl
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.42 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.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 phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 Y D VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor4bb_1
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.netlist.tsv b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.netlist.tsv
index d4c43d7..d76bd55 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.netlist.tsv
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.42	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.26	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.26	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.26	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.26	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	1	0.84	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.spice b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.spice
index 8d1a2c1..ec568d2 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.spice
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__nor4bb_1 A B C_N D_N VGND VNB VPB VPWR Y
-M1000 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=1.071e+12p pd=8.31e+06u as=5.082e+11p ps=4.57e+06u
-M1001 VGND a_375_269# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR D_N a_27_508# VPB phighvt w=420000u l=150000u
-+  ad=4.977e+11p pd=4.67e+06u as=1.113e+11p ps=1.37e+06u
-M1003 a_375_269# C_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1004 a_333_367# a_27_508# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=3.339e+11p ps=3.05e+06u
-M1005 a_513_367# B a_405_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.914e+11p pd=3.3e+06u as=4.914e+11p ps=3.3e+06u
-M1006 VGND D_N a_27_508# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A a_513_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_27_508# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_375_269# C_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1011 a_405_367# a_375_269# a_333_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_513_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND a_27_508# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_405_367# B a_513_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_333_367# a_375_269# a_405_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_27_508# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND C_N a_375_269# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR C_N a_375_269# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 Y a_27_508# a_333_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 Y a_375_269# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_27_508# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.cdl b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.cdl
index d8bcfb2..a29a761 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.cdl
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.42 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=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 sndPA B VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 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 sndPB C VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 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
-MMP3 sndPC D VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 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 C C_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort 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
-MMN1 Y B VNB nshort 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
-MMN2 Y C VNB nshort 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
-MMN3 Y D VNB nshort 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
-MMIN2 C C_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor4bb_2
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.netlist.tsv b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.netlist.tsv
index 76cb4ae..b1d0695 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.netlist.tsv
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.42	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.26	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.26	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.26	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.26	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	2	0.84	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.spice b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.spice
index 77eb41b..422050f 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.spice
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__nor4bb_2 A B C_N D_N VGND VNB VPB VPWR Y
-M1000 Y a_45_164# VGND VNB nshort w=840000u l=150000u
-+  ad=9.408e+11p pd=8.96e+06u as=1.8522e+12p ps=1.436e+07u
-M1001 a_718_355# a_45_164# a_463_355# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.56e+11p pd=6.24e+06u as=1.0206e+12p ps=9.18e+06u
-M1002 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_919_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0206e+12p pd=9.18e+06u as=6.132e+11p ps=5.16e+06u
-M1004 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y a_286_512# a_463_355# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1006 VGND C_N a_45_164# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 a_286_512# D_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1008 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_718_355# B a_919_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_45_164# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_286_512# D_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.449e+11p pd=1.53e+06u as=0p ps=0u
-M1012 Y a_286_512# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A a_919_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR C_N a_45_164# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1015 VGND a_286_512# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_463_355# a_286_512# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_463_355# a_45_164# a_718_355# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_919_367# B a_718_355# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND D_N a_286_512# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 Y a_286_512# a_463_355# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND a_45_164# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 Y a_45_164# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_718_355# B a_919_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_45_164# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_45_164# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND a_286_512# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 Y a_286_512# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_919_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_718_355# a_45_164# a_463_355# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_919_367# B a_718_355# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 VPWR D_N a_286_512# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 a_463_355# a_45_164# a_718_355# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VPWR A a_919_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_463_355# a_286_512# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.cdl b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.cdl
index 408a888..7dc00d3 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.cdl
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 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.26 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.26 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.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 phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=4 w=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 sndPB C VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=4 w=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 sndPC D VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 m=4 w=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 C C_N VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB phighvt m=1 w=1.26 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.84 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.84 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.84 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor4bb_4
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.netlist.tsv b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.netlist.tsv
index 69169b0..565f3f6 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.netlist.tsv
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	4	0.84	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.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.spice b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.spice
index b04b329..d4b35e9 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.spice
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_lp__nor4bb_4 A B C_N D_N VGND VNB VPB VPWR Y
-M1000 Y a_206_51# VGND VNB nshort w=840000u l=150000u
-+  ad=1.8816e+12p pd=1.792e+07u as=2.9106e+12p ps=2.373e+07u
-M1001 a_774_349# a_206_51# a_347_349# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=1.7262e+12p ps=1.534e+07u
-M1002 VGND a_37_51# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A a_1139_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0584e+12p pd=9.24e+06u as=1.7325e+12p ps=1.535e+07u
-M1004 VGND a_206_51# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_347_349# a_37_51# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1006 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_347_349# a_206_51# a_774_349# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_1139_367# B a_774_349# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_37_51# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_206_51# C_N VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1011 VPWR A a_1139_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y a_37_51# a_347_349# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_347_349# a_206_51# a_774_349# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1139_367# B a_774_349# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND D_N a_37_51# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1016 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y a_37_51# a_347_349# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_1139_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_774_349# B a_1139_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND a_206_51# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1139_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y a_37_51# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_774_349# a_206_51# a_347_349# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_206_51# C_N VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1029 Y a_37_51# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_347_349# a_37_51# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR D_N a_37_51# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1033 a_774_349# B a_1139_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Y a_206_51# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND B Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR C_N a_206_51# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_1139_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR A a_1139_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND a_37_51# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 Y a_206_51# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_37_51# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND a_206_51# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 Y a_37_51# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_347_349# a_206_51# a_774_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_347_349# a_37_51# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_774_349# B a_1139_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_1139_367# B a_774_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VGND A Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_347_349# a_206_51# a_774_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_774_349# a_206_51# a_347_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_774_349# a_206_51# a_347_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VGND C_N a_206_51# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 a_1139_367# B a_774_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 VGND a_37_51# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 Y a_37_51# a_347_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 Y a_206_51# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 a_774_349# B a_1139_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 VPWR A a_1139_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 Y B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 a_1139_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 Y a_37_51# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X31 VGND a_206_51# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X32 a_37_51# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X33 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X34 a_347_349# a_37_51# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X35 Y a_37_51# a_347_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.cdl b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.cdl
index 937f217..acfe402 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.cdl
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.cdl
@@ -16,40 +16,40 @@
 
 .SUBCKT sky130_fd_sc_lp__nor4bb_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A 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
-MMP1 sndPA B VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B 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
-MMP2 sndPB C VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C 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
-MMP3 sndPC D VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D 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 C C_N VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIP2 C C_N 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
-MMIP3 D D_N VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIP3 D D_N 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
-MMN0 Y 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
-MMN1 net112 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN2 net108 C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 net112 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
-MMN3 net117 D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 net108 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
-MI10 Y 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
-MI11 Y 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
-MMIN2 C C_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 net117 D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI10 Y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 Y 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
-MI9 net93 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI11 Y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net89 C_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net85 D_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI12 Y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net93 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
+MI8 net89 C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net85 D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor4bb_lp
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.netlist.tsv b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.netlist.tsv
index 3725277..c09569f 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.netlist.tsv
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.netlist.tsv
@@ -1,20 +1,20 @@
 sky130_fd_sc_lp__nor4bb_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	net93	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	net112	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	net108	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	net117	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	Y	B	net112	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	Y	C	net108	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	net89	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	net85	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	Y	D	net117	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net93	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net89	C_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net85	D_N	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	1	1	0.25	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.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	net93	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	net112	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	net108	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	net117	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	Y	B	net112	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	Y	C	net108	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	net89	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	net85	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	Y	D	net117	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net93	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net89	C_N	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net85	D_N	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/nor4bb/sky130_fd_sc_lp__nor4bb_lp.spice b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.spice
index e26311f..5e3a209 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.spice
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_lp__nor4bb_lp A B C_N D_N VGND VNB VPB VPWR Y
-M1000 a_245_409# a_430_21# Y VPB phighvt w=1e+06u l=250000u
-+  ad=5.7e+11p pd=5.14e+06u as=2.85e+11p ps=2.57e+06u
-M1001 VGND C_N a_144_47# VNB nshort w=420000u l=150000u
-+  ad=4.242e+11p pd=4.54e+06u as=8.82e+10p ps=1.26e+06u
-M1002 a_624_47# B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1003 a_788_409# B a_352_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=5.7e+11p ps=5.14e+06u
-M1004 Y B a_624_47# VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=0p ps=0u
-M1005 VPWR C_N a_27_409# VPB phighvt w=1e+06u l=250000u
-+  ad=6.05e+11p pd=5.21e+06u as=2.85e+11p ps=2.57e+06u
-M1006 a_430_21# D_N VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1007 a_144_47# C_N a_27_409# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1008 a_302_47# a_27_409# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1009 Y a_27_409# a_302_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_782_47# A Y VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1011 VPWR A a_788_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A a_782_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_460_47# a_430_21# Y VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1014 VGND a_430_21# a_460_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_980_47# D_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1016 a_352_409# a_27_409# a_245_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_430_21# D_N a_980_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
+X0 a_782_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_302_47# a_27_409# Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_352_409# B a_788_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 VGND D_N a_980_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 Y a_430_21# a_460_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_624_47# B Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 Y A a_782_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_788_409# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 Y a_430_21# a_245_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_27_409# C_N a_144_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_27_409# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 a_144_47# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND a_27_409# a_302_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VGND B a_624_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_980_47# D_N a_430_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_245_409# a_27_409# a_352_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X16 VPWR D_N a_430_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X17 a_460_47# a_430_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.cdl b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.cdl
index 2bbdf46..e6f590b 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.cdl
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__nor4bb_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 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=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 C C_N VPB pfet_01v8_hvt m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 Y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP1 sndPA B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 Y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 Y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 Y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 Y A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 Y B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 Y C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 Y D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__nor4bb_m
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.netlist.tsv b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.netlist.tsv
index ca1b481..1cd30c5 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.netlist.tsv
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__nor4bb_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	Y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	Y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	Y	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	Y	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	Y	VPB	pfet_01v8_hvt	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	Y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	Y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	Y	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	Y	D	VGND	VNB	nfet_01v8	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.spice b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.spice
index 9681b61..fe4ab07 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.spice
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__nor4bb_m A B C_N D_N VGND VNB VPB VPWR Y
-M1000 VGND A Y VNB nshort w=420000u l=150000u
-+  ad=5.46e+11p pd=5.12e+06u as=2.352e+11p ps=2.8e+06u
-M1001 VPWR A a_454_397# VPB phighvt w=420000u l=150000u
-+  ad=3.696e+11p pd=3.44e+06u as=8.82e+10p ps=1.26e+06u
-M1002 VGND D_N a_27_507# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1003 a_310_397# a_27_507# Y VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1004 Y a_27_507# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_284_99# C_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 a_382_397# a_284_99# a_310_397# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1007 a_284_99# C_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1008 VGND a_284_99# Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_454_397# B a_382_397# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR D_N a_27_507# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1011 Y B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_507# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND C_N a_284_99# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_454_397# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 Y A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_27_507# Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 Y a_284_99# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 Y a_27_507# a_310_397# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_310_397# a_284_99# a_382_397# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_27_507# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_382_397# B a_454_397# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 VPWR C_N a_284_99# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 VGND B Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_0.cdl b/cells/o2111a/sky130_fd_sc_lp__o2111a_0.cdl
index 1d63692..fff83c7 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_0.cdl
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_0.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__o2111a_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMPC0 VPWR C1 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
+MMPD0 VPWR D1 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
+MMIPX X y 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPD0 VPWR D1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 pndC C1 VNB nfet_01v8 m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 y D1 VNB nfet_01v8 m=1 w=0.42 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.42 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o2111a_0
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_0.netlist.tsv b/cells/o2111a/sky130_fd_sc_lp__o2111a_0.netlist.tsv
index 2bb9810..f3cb4c1 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_0.netlist.tsv
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_0.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__o2111a_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	pndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	0.64	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.64	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.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	pndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o2111a/sky130_fd_sc_lp__o2111a_0.spice b/cells/o2111a/sky130_fd_sc_lp__o2111a_0.spice
index 97a8139..fb7831e 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_0.spice
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_0.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o2111a_0 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 VPWR C1 a_80_21# VPB phighvt w=640000u l=150000u
-+  ad=7.904e+11p pd=6.31e+06u as=3.584e+11p ps=3.68e+06u
-M1001 a_315_47# D1 a_80_21# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1002 VPWR a_80_21# X VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1003 VGND a_80_21# X VNB nshort w=420000u l=150000u
-+  ad=2.583e+11p pd=2.91e+06u as=1.113e+11p ps=1.37e+06u
-M1004 a_387_47# C1 a_315_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1005 a_459_47# B1 a_387_47# VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=0p ps=0u
-M1006 a_585_481# A2 a_80_21# VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1007 VPWR A1 a_585_481# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_80_21# D1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_459_47# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A2 a_459_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_80_21# B1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_80_21# A2 a_585_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_585_481# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_315_47# C1 a_387_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR D1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_80_21# D1 a_315_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND A1 a_459_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_80_21# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 VPWR B1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 a_387_47# B1 a_459_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_459_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_1.cdl b/cells/o2111a/sky130_fd_sc_lp__o2111a_1.cdl
index 3316ea7..dc3a9de 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_1.cdl
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPD0 VPWR D1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 pndC C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 y D1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 pndC C1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMND0 y D1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o2111a_1
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_1.netlist.tsv b/cells/o2111a/sky130_fd_sc_lp__o2111a_1.netlist.tsv
index 71921ce6..37098ab 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_1.netlist.tsv
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	pndC	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	pndC	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_1.spice b/cells/o2111a/sky130_fd_sc_lp__o2111a_1.spice
index bac995b..1e10def 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_1.spice
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o2111a_1 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 VGND A2 a_517_49# VNB nshort w=840000u l=150000u
-+  ad=4.578e+11p pd=4.45e+06u as=7.434e+11p ps=5.13e+06u
-M1001 a_80_21# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=8.442e+11p pd=6.38e+06u as=2.3562e+12p ps=1.13e+07u
-M1002 a_409_49# C1 a_337_49# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=1.764e+11p ps=2.1e+06u
-M1003 VGND a_80_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1004 a_517_49# B1 a_409_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_337_49# D1 a_80_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1006 VPWR C1 a_80_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_685_367# A2 a_80_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1008 VPWR A1 a_685_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_517_49# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_80_21# D1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_80_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 a_517_49# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_337_49# C1 a_409_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_409_49# B1 a_517_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND A1 a_517_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_80_21# A2 a_685_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_685_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_80_21# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR D1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR B1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_80_21# D1 a_337_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_2.cdl b/cells/o2111a/sky130_fd_sc_lp__o2111a_2.cdl
index 181ae9a..6b84779 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_2.cdl
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPD0 VPWR D1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 pndC C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 y D1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 pndC C1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMND0 y D1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 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_lp__o2111a_2
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_2.netlist.tsv b/cells/o2111a/sky130_fd_sc_lp__o2111a_2.netlist.tsv
index ec7b910..70d2dfb 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_2.netlist.tsv
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	pndC	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	pndC	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_2.spice b/cells/o2111a/sky130_fd_sc_lp__o2111a_2.spice
index 36d52aa..18640bd 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_2.spice
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__o2111a_2 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 VPWR A1 a_674_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.079e+12p pd=1.338e+07u as=4.914e+11p ps=3.3e+06u
-M1001 a_386_51# D1 a_80_21# VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=2.226e+11p ps=2.21e+06u
-M1002 a_458_51# C1 a_386_51# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=0p ps=0u
-M1003 a_80_21# D1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=8.442e+11p pd=6.38e+06u as=0p ps=0u
-M1004 a_80_21# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_80_21# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=7.728e+11p ps=6.88e+06u
-M1006 a_566_51# B1 a_458_51# VNB nshort w=840000u l=150000u
-+  ad=5.502e+11p pd=4.67e+06u as=0p ps=0u
-M1007 VPWR a_80_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1008 VGND a_80_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A2 a_566_51# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_674_367# A2 a_80_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_566_51# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_80_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR C1 a_80_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_566_51# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND A1 a_566_51# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_80_21# D1 a_386_51# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND a_80_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPWR a_80_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_674_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_80_21# A2 a_674_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR B1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_386_51# C1 a_458_51# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_80_21# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_458_51# B1 a_566_51# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VPWR D1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_4.cdl b/cells/o2111a/sky130_fd_sc_lp__o2111a_4.cdl
index 44ae1ad..4b786b8 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_4.cdl
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 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 phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 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 phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 pndC C1 VNB nfet_01v8 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 phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 y D1 VNB nfet_01v8 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=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
-MMNA1 pndA A2 VNB nshort 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
-MMNB0 pndB B1 VNB nshort 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
-MMNC0 pndC C1 VNB nshort 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
-MMND0 y D1 VNB nshort 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
-MMINX X y VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=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_lp__o2111a_4
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_4.netlist.tsv b/cells/o2111a/sky130_fd_sc_lp__o2111a_4.netlist.tsv
index ea7da1e..7dacf2c 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_4.netlist.tsv
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	pndC	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	pndC	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_4.spice b/cells/o2111a/sky130_fd_sc_lp__o2111a_4.spice
index 06a6406..f32111e 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_4.spice
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_lp__o2111a_4 A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 VGND A1 a_389_65# VNB nshort w=840000u l=150000u
-+  ad=1.2012e+12p pd=1.126e+07u as=7.056e+11p ps=6.72e+06u
-M1001 a_741_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=2.5326e+12p ps=2.166e+07u
-M1002 VPWR a_32_367# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1003 VGND a_32_367# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1004 VPWR B1 a_32_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=2.3184e+12p ps=1.628e+07u
-M1005 a_389_65# B1 a_289_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=5.292e+11p ps=4.62e+06u
-M1006 a_741_367# A2 a_32_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_289_65# C1 a_32_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=7.728e+11p ps=6.88e+06u
-M1008 a_389_65# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_32_367# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_32_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A1 a_741_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_32_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR D1 a_32_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_32_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_289_65# B1 a_389_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR C1 a_32_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_32_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_32_65# D1 a_32_367# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1019 a_389_65# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_32_367# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_32_367# D1 a_32_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_32_367# C1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A2 a_389_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_32_367# A2 a_741_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X a_32_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_32_367# D1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_32_65# C1 a_289_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_289_65# B1 a_389_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_32_367# D1 a_32_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_389_65# B1 a_289_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 X a_32_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR B1 a_32_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_289_65# C1 a_32_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR a_32_367# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_741_367# A2 a_32_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR A1 a_741_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 X a_32_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VGND a_32_367# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_32_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_32_65# C1 a_289_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VPWR a_32_367# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 X a_32_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_32_367# A2 a_741_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_389_65# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 VPWR C1 a_32_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 X a_32_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VGND A2 a_389_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 a_32_367# D1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 a_389_65# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 a_32_65# D1 a_32_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 VGND A1 a_389_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 a_32_367# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 VPWR D1 a_32_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 a_741_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 VGND a_32_367# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.cdl b/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.cdl
index fca01ad..ce823a9 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.cdl
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.cdl
@@ -16,30 +16,30 @@
 
 .SUBCKT sky130_fd_sc_lp__o2111a_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMPC0 VPWR C1 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
+MMPD0 VPWR D1 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
+MMIPX X y 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPD0 VPWR D1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNC0 pndC C1 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 y D1 VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=1 w=0.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net53 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net53 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o2111a_lp
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.netlist.tsv b/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.netlist.tsv
index c539b77..b130115 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.netlist.tsv
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.netlist.tsv
@@ -1,15 +1,15 @@
 sky130_fd_sc_lp__o2111a_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	pndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	net53	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net53	y	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	VPWR	D1	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	pndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	net53	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net53	y	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/o2111a/sky130_fd_sc_lp__o2111a_lp.spice b/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.spice
index 4b47e00..2d9d1cc 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.spice
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.spice
@@ -16,30 +16,17 @@
 
 
 .subckt sky130_fd_sc_lp__o2111a_lp A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 a_232_419# A2 a_134_419# VPB phighvt w=1e+06u l=250000u
-+  ad=6.2e+11p pd=5.24e+06u as=2.4e+11p ps=2.48e+06u
-M1001 X a_232_419# a_708_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1002 X a_232_419# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=1.165e+12p ps=8.33e+06u
-M1003 a_404_51# C1 a_326_51# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.008e+11p ps=1.32e+06u
-M1004 a_232_419# D1 a_404_51# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1005 a_326_51# B1 a_29_51# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.835e+11p ps=3.03e+06u
-M1006 a_708_47# a_232_419# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.709e+11p ps=2.97e+06u
-M1007 a_232_419# C1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR D1 a_232_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B1 a_232_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_29_51# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_134_419# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A1 a_29_51# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_134_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_134_419# A2 a_232_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_404_51# D1 a_232_419# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR a_232_419# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_232_419# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_29_51# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR C1 a_232_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_232_419# D1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_326_51# C1 a_404_51# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND a_232_419# a_708_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND A2 a_29_51# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_29_51# B1 a_326_51# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_708_47# a_232_419# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_m.cdl b/cells/o2111a/sky130_fd_sc_lp__o2111a_m.cdl
index 5704c7d..716fd11 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_m.cdl
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_m.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__o2111a_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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.42 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.42 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.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPD0 VPWR D1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 pndC C1 VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 y D1 VNB nfet_01v8 m=1 w=0.42 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.42 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o2111a_m
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_m.netlist.tsv b/cells/o2111a/sky130_fd_sc_lp__o2111a_m.netlist.tsv
index 5f53548..2804a2b 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_m.netlist.tsv
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_m.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__o2111a_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	y	D1	pndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	0.42	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	y	D1	pndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o2111a/sky130_fd_sc_lp__o2111a_m.spice b/cells/o2111a/sky130_fd_sc_lp__o2111a_m.spice
index 628afec..2362471 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_m.spice
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_m.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o2111a_m A1 A2 B1 C1 D1 VGND VNB VPB VPWR X
-M1000 a_348_47# D1 a_80_21# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.1e+11p ps=1.84e+06u
-M1001 VPWR a_80_21# X VPB phighvt w=420000u l=150000u
-+  ad=4.746e+11p pd=4.78e+06u as=1.113e+11p ps=1.37e+06u
-M1002 VGND A2 a_492_47# VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=2.289e+11p ps=2.77e+06u
-M1003 a_564_535# A2 a_80_21# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.352e+11p ps=2.8e+06u
-M1004 VGND a_80_21# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 VPWR A1 a_564_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_492_47# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_420_47# C1 a_348_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1008 VPWR C1 a_80_21# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_492_47# B1 a_420_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_80_21# B1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_80_21# D1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR D1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_420_47# B1 a_492_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VPWR B1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_492_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND A1 a_492_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_348_47# C1 a_420_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_80_21# A2 a_564_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_564_535# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_80_21# D1 a_348_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_80_21# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.cdl b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.cdl
index 8b73c5c..172f8ba 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.cdl
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o2111ai_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMPC0 VPWR C1 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
+MMPD0 VPWR D1 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
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 pndC C1 VNB nfet_01v8 m=1 w=0.42 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.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.42 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 Y D1 VNB nfet_01v8 m=1 w=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_lp__o2111ai_0
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.netlist.tsv b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.netlist.tsv
index 85d3da5..26b40b7 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.netlist.tsv
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o2111ai_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	pndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	0.64	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.64	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.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	pndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.spice b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.spice
index f53eda1..5b55138 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.spice
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o2111ai_0 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 VPWR C1 Y VPB phighvt w=640000u l=150000u
-+  ad=9.536e+11p pd=6.82e+06u as=3.904e+11p ps=3.78e+06u
-M1001 VGND A2 a_339_47# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=3.717e+11p ps=3.45e+06u
-M1002 Y B1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y D1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_339_47# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_520_465# A2 Y VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1006 a_195_47# D1 Y VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.541e+11p ps=2.05e+06u
-M1007 a_267_47# C1 a_195_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1008 VPWR A1 a_520_465# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_339_47# B1 a_267_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A1 a_339_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 Y D1 a_195_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR D1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 a_267_47# B1 a_339_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 Y A2 a_520_465# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 a_520_465# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 a_339_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_195_47# C1 a_267_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.cdl b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.cdl
index 60e8f09..d9d04bf 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.cdl
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 pndC C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPD0 VPWR D1 VPB phighvt m=1 w=1.26 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.84 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.84 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 Y D1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o2111ai_1
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.netlist.tsv b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.netlist.tsv
index 74d09b8..149ad79 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.netlist.tsv
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	pndC	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	pndC	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.spice b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.spice
index ce55d9e..eeb4f86 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.spice
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o2111ai_1 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 a_513_367# A2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=1.0206e+12p ps=6.66e+06u
-M1001 VGND A2 a_361_47# VNB nshort w=840000u l=150000u
-+  ad=3.528e+11p pd=2.52e+06u as=5.586e+11p ps=4.69e+06u
-M1002 a_181_47# D1 Y VNB nshort w=840000u l=150000u
-+  ad=2.436e+11p pd=2.26e+06u as=5.082e+11p ps=2.89e+06u
-M1003 a_269_47# C1 a_181_47# VNB nshort w=840000u l=150000u
-+  ad=2.604e+11p pd=2.3e+06u as=0p ps=0u
-M1004 VPWR A1 a_513_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.1718e+12p pd=9.42e+06u as=0p ps=0u
-M1005 VPWR C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_361_47# B1 a_269_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_361_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y D1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A1 a_361_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_181_47# C1 a_269_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR D1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_269_47# B1 a_361_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 Y A2 a_513_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_513_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 Y D1 a_181_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_361_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.cdl b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.cdl
index 7700ae3..0f48ab9 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.cdl
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 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 phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 pndC C1 VNB nfet_01v8 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 phighvt m=2 w=1.26 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.84 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.84 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 Y D1 VNB nfet_01v8 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_lp__o2111ai_2
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.netlist.tsv b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.netlist.tsv
index 864699d..517080c 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.netlist.tsv
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	pndC	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	pndC	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.spice b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.spice
index dc574c7..227c313 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.spice
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__o2111ai_2 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 VPWR C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7262e+12p pd=1.534e+07u as=1.4112e+12p ps=1.232e+07u
-M1001 a_298_69# C1 a_43_69# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=7.224e+11p ps=6.76e+06u
-M1002 VGND A1 a_522_47# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=9.156e+11p ps=8.9e+06u
-M1003 a_694_367# A2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0206e+12p pd=9.18e+06u as=0p ps=0u
-M1004 VGND A2 a_522_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_298_69# B1 a_522_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_694_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_522_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y D1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y C1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_43_69# C1 a_298_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_43_69# D1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1013 a_522_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A2 a_694_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y D1 a_43_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_522_47# B1 a_298_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR D1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A1 a_694_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 Y D1 a_43_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_694_367# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_522_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPWR A1 a_694_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_694_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 Y A2 a_694_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_43_69# C1 a_298_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_298_69# C1 a_43_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VPWR D1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 Y D1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_522_47# B1 a_298_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_298_69# B1 a_522_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_43_69# D1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 VGND A1 a_522_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_522_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 VGND A2 a_522_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.cdl b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.cdl
index ea3f0f1..912ff9d 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.cdl
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 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=4 w=1.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=4 w=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 phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 pndC C1 VNB nfet_01v8 m=4 w=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 phighvt m=4 w=1.26 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.84 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.84 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 Y D1 VNB nfet_01v8 m=4 w=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_lp__o2111ai_4
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.netlist.tsv b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.netlist.tsv
index 9e69e2d..3aecf8d 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.netlist.tsv
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	pndC	VNB	nshort	4	0.84	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	4	1.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	VPWR	D1	Y	VPB	pfet_01v8_hvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	pndC	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.spice b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.spice
index 9b988ce..f5b7d46 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.spice
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__o2111ai_4 A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 VPWR D1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.1374e+12p pd=2.766e+07u as=3.5658e+12p ps=2.834e+07u
-M1001 a_819_47# B1 a_454_47# VNB nshort w=840000u l=150000u
-+  ad=1.9236e+12p pd=1.634e+07u as=9.408e+11p ps=8.96e+06u
-M1002 VPWR B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_1210_367# A2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=0p ps=0u
-M1004 VPWR C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_1210_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_47# C1 a_454_47# VNB nshort w=840000u l=150000u
-+  ad=1.1508e+12p pd=1.114e+07u as=0p ps=0u
-M1008 VGND A2 a_819_47# VNB nshort w=840000u l=150000u
-+  ad=9.408e+11p pd=8.96e+06u as=0p ps=0u
-M1009 VPWR C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y D1 a_27_47# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1011 Y D1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_1210_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_454_47# C1 a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A2 a_1210_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_819_47# B1 a_454_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_27_47# D1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_819_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_27_47# D1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_819_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND A2 a_819_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_454_47# B1 a_819_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR A1 a_1210_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y D1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y C1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1210_367# A2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y A2 a_1210_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR A1 a_1210_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_27_47# C1 a_454_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Y C1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_454_47# C1 a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_454_47# B1 a_819_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND A1 a_819_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_819_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR D1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Y D1 a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_819_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND A1 a_819_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_454_47# C1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND A1 a_819_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 Y D1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_27_47# C1 a_454_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPWR D1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_27_47# D1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_454_47# C1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_819_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_1210_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR A1 a_1210_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 Y D1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_819_47# B1 a_454_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 Y A2 a_1210_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_1210_367# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 Y D1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VPWR D1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_454_47# B1 a_819_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 a_819_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 VGND A1 a_819_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_819_47# B1 a_454_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 VGND A2 a_819_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 a_819_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 a_1210_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 a_1210_367# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 Y A2 a_1210_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X32 a_819_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X33 VGND A2 a_819_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X34 Y D1 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X35 a_454_47# B1 a_819_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X36 VPWR A1 a_1210_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X37 a_27_47# D1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X38 a_27_47# C1 a_454_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X39 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.cdl b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.cdl
index 6314db5..b161157 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.cdl
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o2111ai_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMPC0 VPWR C1 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
+MMPD0 VPWR D1 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
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNC0 pndC C1 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 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.42 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 Y D1 VNB nfet_01v8 m=1 w=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_lp__o2111ai_lp
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.netlist.tsv b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.netlist.tsv
index 0ed284d..a1ff809 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.netlist.tsv
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o2111ai_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	pndC	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPD0	MOSFET	VPWR	D1	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	pndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.spice b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.spice
index 048c88f..92c2966 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.spice
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o2111ai_lp A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 a_483_409# A2 Y VPB phighvt w=1e+06u l=250000u
-+  ad=2.5e+11p pd=2.5e+06u as=5.6e+11p ps=5.12e+06u
-M1001 VPWR A1 a_483_409# VPB phighvt w=1e+06u l=250000u
-+  ad=8.7e+11p pd=7.74e+06u as=0p ps=0u
-M1002 a_167_57# D1 Y VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1003 a_245_57# C1 a_167_57# VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1004 VPWR C1 Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_347_57# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.961e+11p pd=3.09e+06u as=1.638e+11p ps=1.62e+06u
-M1006 Y B1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_347_57# B1 a_245_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y D1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A2 a_347_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A2 a_483_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_483_409# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_167_57# C1 a_245_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_245_57# B1 a_347_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_347_57# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 Y D1 a_167_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR D1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 VGND A1 a_347_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.cdl b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.cdl
index 4b81617..da148ac 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.cdl
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o2111ai_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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.42 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.42 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.42 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.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 pndC C1 VNB nfet_01v8 m=1 w=0.42 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.42 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.42 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMND0 Y D1 VNB nfet_01v8 m=1 w=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_lp__o2111ai_m
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.netlist.tsv b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.netlist.tsv
index 6fa0b24..bb20c22 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.netlist.tsv
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o2111ai_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPD0	MOSFET	VPWR	D1	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	pndC	C1	pndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMND0	MOSFET	Y	D1	pndC	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	0.42	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	pndC	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMND0	MOSFET	Y	D1	pndC	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.spice b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.spice
index 58d3b08..96ced13 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.spice
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o2111ai_m A1 A2 B1 C1 D1 VGND VNB VPB VPWR Y
-M1000 a_357_50# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=1.176e+11p ps=1.4e+06u
-M1001 a_443_535# A2 Y VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.352e+11p ps=2.8e+06u
-M1002 Y D1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=4.515e+11p ps=4.67e+06u
-M1003 a_213_50# D1 Y VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.68e+11p ps=1.64e+06u
-M1004 a_285_50# C1 a_213_50# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1005 a_357_50# B1 a_285_50# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_357_50# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A1 a_443_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR C1 Y VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_285_50# B1 a_357_50# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_357_50# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR D1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_443_535# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_213_50# C1 a_285_50# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 Y A2 a_443_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 Y D1 a_213_50# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND A1 a_357_50# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_0.cdl b/cells/o211a/sky130_fd_sc_lp__o211a_0.cdl
index de0038e..25cba69 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_0.cdl
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o211a_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMPC0 VPWR C1 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
+MMIPX X y 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.42 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o211a_0
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_0.netlist.tsv b/cells/o211a/sky130_fd_sc_lp__o211a_0.netlist.tsv
index 341dc76..645a26a 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_0.netlist.tsv
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o211a_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	0.64	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.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o211a/sky130_fd_sc_lp__o211a_0.spice b/cells/o211a/sky130_fd_sc_lp__o211a_0.spice
index dd93157..71fac98 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_0.spice
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o211a_0 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 a_80_21# A2 a_340_485# VPB phighvt w=640000u l=150000u
-+  ad=3.744e+11p pd=3.73e+06u as=1.344e+11p ps=1.7e+06u
-M1001 a_257_47# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=2.415e+11p pd=2.83e+06u as=2.331e+11p ps=2.79e+06u
-M1002 a_340_485# A1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=4.096e+11p ps=3.84e+06u
-M1003 VGND a_80_21# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 a_520_47# B1 a_257_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1005 VPWR a_80_21# X VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.872e+11p ps=2.49e+06u
-M1006 a_80_21# C1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A1 a_257_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_80_21# C1 a_520_47# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1009 VPWR B1 a_80_21# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A2 a_257_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_257_47# B1 a_520_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR A1 a_340_485# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 a_80_21# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_520_47# C1 a_80_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 VPWR C1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 a_257_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_340_485# A2 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_1.cdl b/cells/o211a/sky130_fd_sc_lp__o211a_1.cdl
index 0b2fd32..48cc268 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_1.cdl
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o211a_1
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_1.netlist.tsv b/cells/o211a/sky130_fd_sc_lp__o211a_1.netlist.tsv
index 12e2951..29b8984 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_1.netlist.tsv
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_1.spice b/cells/o211a/sky130_fd_sc_lp__o211a_1.spice
index e94888b..10f27f4 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_1.spice
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o211a_1 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 a_365_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=1.2726e+12p ps=7.06e+06u
-M1001 a_80_237# A2 a_365_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=8.253e+11p pd=6.35e+06u as=0p ps=0u
-M1002 VPWR B1 a_80_237# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND a_80_237# X VNB nshort w=840000u l=150000u
-+  ad=6.174e+11p pd=4.83e+06u as=2.226e+11p ps=2.21e+06u
-M1004 VGND A1 a_266_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=5.502e+11p ps=4.67e+06u
-M1005 a_266_49# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_80_237# C1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_80_237# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1008 a_581_49# B1 a_266_49# VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1009 a_80_237# C1 a_581_49# VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
+X0 VGND A2 a_266_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VPWR C1 a_80_237# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_266_49# B1 a_581_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_266_49# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_80_237# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VPWR A1 a_365_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_365_367# A2 a_80_237# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 X a_80_237# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 X a_80_237# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_581_49# C1 a_80_237# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_2.cdl b/cells/o211a/sky130_fd_sc_lp__o211a_2.cdl
index 60cf4a1..ac5aa62 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_2.cdl
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 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_lp__o211a_2
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_2.netlist.tsv b/cells/o211a/sky130_fd_sc_lp__o211a_2.netlist.tsv
index 662109f..043b474 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_2.netlist.tsv
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_2.spice b/cells/o211a/sky130_fd_sc_lp__o211a_2.spice
index cddf9c6..edc5bac 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_2.spice
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o211a_2 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 a_182_47# B1 a_110_47# VNB nshort w=840000u l=150000u
-+  ad=4.578e+11p pd=4.45e+06u as=1.764e+11p ps=2.1e+06u
-M1001 X a_27_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=1.5183e+12p ps=9.97e+06u
-M1002 VGND a_27_47# X VNB nshort w=840000u l=150000u
-+  ad=8.19e+11p pd=6.99e+06u as=2.352e+11p ps=2.24e+06u
-M1003 a_372_367# A2 a_27_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=9.891e+11p ps=6.61e+06u
-M1004 a_182_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A1 a_372_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_110_47# C1 a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1007 a_27_47# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_27_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_27_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR C1 a_27_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A1 a_182_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_110_47# B1 a_182_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_27_47# C1 a_110_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_27_47# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_182_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 X a_27_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VPWR B1 a_27_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_27_47# A2 a_372_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_372_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VGND A2 a_182_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 X a_27_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_4.cdl b/cells/o211a/sky130_fd_sc_lp__o211a_4.cdl
index e714032..99785ab 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_4.cdl
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 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 phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 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 phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 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=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
-MMNA1 pndA A2 VNB nshort 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
-MMNB0 pndB B1 VNB nshort 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
-MMNC0 y C1 VNB nshort 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
-MMINX X y VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=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_lp__o211a_4
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_4.netlist.tsv b/cells/o211a/sky130_fd_sc_lp__o211a_4.netlist.tsv
index 9cc4140..b78f793 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_4.netlist.tsv
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_4.spice b/cells/o211a/sky130_fd_sc_lp__o211a_4.spice
index 3940d29..5a41da2 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_4.spice
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_lp__o211a_4 A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 a_986_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=2.1294e+12p ps=1.85e+07u
-M1001 VGND A1 a_475_49# VNB nshort w=840000u l=150000u
-+  ad=1.2432e+12p pd=1.136e+07u as=1.0164e+12p ps=9.14e+06u
-M1002 VPWR a_80_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1003 a_475_49# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_475_49# B1 a_574_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1005 VPWR B1 a_80_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.701e+12p ps=1.026e+07u
-M1006 a_475_49# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_986_367# A2 a_80_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_574_49# B1 a_475_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_80_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR C1 a_80_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_80_21# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1012 X a_80_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_80_21# A2 a_986_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_80_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_80_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_80_21# C1 a_574_49# VNB nshort w=840000u l=150000u
-+  ad=4.273e+11p pd=2.88e+06u as=0p ps=0u
-M1017 a_80_21# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A2 a_475_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A1 a_986_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_574_49# C1 a_80_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_80_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_80_21# C1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 X a_80_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR a_80_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_986_367# A2 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_80_21# A2 a_986_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND a_80_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR A1 a_986_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_475_49# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND A1 a_475_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VPWR B1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_475_49# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_80_21# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_475_49# B1 a_574_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_986_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_574_49# C1 a_80_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VPWR a_80_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_80_21# C1 a_574_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_80_21# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 a_574_49# B1 a_475_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 VPWR C1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 VGND a_80_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 VGND A2 a_475_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_lp.cdl b/cells/o211a/sky130_fd_sc_lp__o211a_lp.cdl
index 2c922b8..7813187 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_lp.cdl
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_lp.cdl
@@ -16,26 +16,26 @@
 
 .SUBCKT sky130_fd_sc_lp__o211a_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMPC0 VPWR C1 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
+MMIPX X y 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=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 net52 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net52 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o211a_lp
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_lp.netlist.tsv b/cells/o211a/sky130_fd_sc_lp__o211a_lp.netlist.tsv
index 704d063..1386efa 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_lp.netlist.tsv
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_lp.netlist.tsv
@@ -1,13 +1,13 @@
 sky130_fd_sc_lp__o211a_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	net52	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net52	y	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	net52	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net52	y	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/o211a/sky130_fd_sc_lp__o211a_lp.spice b/cells/o211a/sky130_fd_sc_lp__o211a_lp.spice
index 8a1d8e6..cb0509b 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_lp.spice
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_lp.spice
@@ -16,26 +16,15 @@
 
 
 .subckt sky130_fd_sc_lp__o211a_lp A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 a_606_47# a_232_419# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.045e+11p ps=3.13e+06u
-M1001 X a_232_419# a_606_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1002 a_27_144# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=2.373e+11p pd=2.81e+06u as=0p ps=0u
-M1003 a_232_419# A2 a_134_419# VPB phighvt w=1e+06u l=250000u
-+  ad=5.65e+11p pd=5.13e+06u as=2.4e+11p ps=2.48e+06u
-M1004 X a_232_419# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=9.6e+11p ps=7.92e+06u
-M1005 a_232_419# C1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_232_419# C1 a_318_144# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.008e+11p ps=1.32e+06u
-M1007 VPWR B1 a_232_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_318_144# B1 a_27_144# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_134_419# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A1 a_27_144# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_134_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_134_419# A2 a_232_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_27_144# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_318_144# C1 a_232_419# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_232_419# a_606_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR C1 a_232_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_232_419# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 VGND A2 a_27_144# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_232_419# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_27_144# B1 a_318_144# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_606_47# a_232_419# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_m.cdl b/cells/o211a/sky130_fd_sc_lp__o211a_m.cdl
index b98cf60..31be816 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_m.cdl
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o211a_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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.42 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.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.42 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o211a_m
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_m.netlist.tsv b/cells/o211a/sky130_fd_sc_lp__o211a_m.netlist.tsv
index 6c5f364..ea25f65 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_m.netlist.tsv
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o211a_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o211a/sky130_fd_sc_lp__o211a_m.spice b/cells/o211a/sky130_fd_sc_lp__o211a_m.spice
index 85ee2a3..defd0df 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_m.spice
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o211a_m A1 A2 B1 C1 VGND VNB VPB VPWR X
-M1000 VGND A1 a_217_49# VNB nshort w=420000u l=150000u
-+  ad=2.625e+11p pd=2.93e+06u as=2.289e+11p ps=2.77e+06u
-M1001 a_80_60# C1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.751e+11p pd=2.99e+06u as=3.36e+11p ps=3.28e+06u
-M1002 VGND a_80_60# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1003 VPWR a_80_60# X VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 VPWR B1 a_80_60# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_217_49# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_80_60# C1 a_488_49# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1007 a_300_371# A1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1008 a_488_49# B1 a_217_49# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_80_60# A2 a_300_371# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_217_49# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND A2 a_217_49# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR C1 a_80_60# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_217_49# B1 a_488_49# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 X a_80_60# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_80_60# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VPWR A1 a_300_371# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 X a_80_60# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_300_371# A2 a_80_60# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_488_49# C1 a_80_60# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_0.cdl b/cells/o211ai/sky130_fd_sc_lp__o211ai_0.cdl
index 8d3861d..d1c605a 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_0.cdl
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_0.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__o211ai_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMPC0 VPWR C1 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
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=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_lp__o211ai_0
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_0.netlist.tsv b/cells/o211ai/sky130_fd_sc_lp__o211ai_0.netlist.tsv
index e9794ae..3627729 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_0.netlist.tsv
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_0.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__o211ai_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	0.64	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.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_0.spice b/cells/o211ai/sky130_fd_sc_lp__o211ai_0.spice
index 93194d7..11c45b9 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_0.spice
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_0.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__o211ai_0 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 Y A2 a_131_465# VPB phighvt w=640000u l=150000u
-+  ad=3.488e+11p pd=3.65e+06u as=1.344e+11p ps=1.7e+06u
-M1001 Y C1 a_359_47# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1002 a_131_465# A1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=5.664e+11p ps=4.33e+06u
-M1003 a_359_47# B1 a_36_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.289e+11p ps=2.77e+06u
-M1004 VGND A1 a_36_47# VNB nshort w=420000u l=150000u
-+  ad=2.604e+11p pd=2.08e+06u as=0p ps=0u
-M1005 VPWR B1 Y VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y C1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_36_47# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_36_47# B1 a_359_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_131_465# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_359_47# C1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_36_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND A2 a_36_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR A1 a_131_465# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_1.cdl b/cells/o211ai/sky130_fd_sc_lp__o211ai_1.cdl
index c8cdbd9..db39f16 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_1.cdl
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.26 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.84 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o211ai_1
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_1.netlist.tsv b/cells/o211ai/sky130_fd_sc_lp__o211ai_1.netlist.tsv
index ea3701e..3d28f97 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_1.netlist.tsv
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_1.spice b/cells/o211ai/sky130_fd_sc_lp__o211ai_1.spice
index de01c1b..64da328 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_1.spice
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__o211ai_1 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 VPWR B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=8.253e+11p pd=6.35e+06u as=1.2537e+12p ps=7.03e+06u
-M1001 VGND A1 a_27_47# VNB nshort w=840000u l=150000u
-+  ad=3.276e+11p pd=2.46e+06u as=5.502e+11p ps=4.67e+06u
-M1002 a_27_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y C1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_326_47# B1 a_27_47# VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1005 Y C1 a_326_47# VNB nshort w=840000u l=150000u
-+  ad=5.082e+11p pd=2.89e+06u as=0p ps=0u
-M1006 Y A2 a_110_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=2.646e+11p ps=2.94e+06u
-M1007 a_110_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_27_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_110_367# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR A1 a_110_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_326_47# C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND A2 a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_27_47# B1 a_326_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_2.cdl b/cells/o211ai/sky130_fd_sc_lp__o211ai_2.cdl
index 9e4862d..cac3626 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_2.cdl
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 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 phighvt m=2 w=1.26 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.84 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 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_lp__o211ai_2
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_2.netlist.tsv b/cells/o211ai/sky130_fd_sc_lp__o211ai_2.netlist.tsv
index c75ce6f..df0c1ad 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_2.netlist.tsv
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_2.spice b/cells/o211ai/sky130_fd_sc_lp__o211ai_2.spice
index 7fbaea1..785ef0c 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_2.spice
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__o211ai_2 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 VGND A1 a_286_65# VNB nshort w=840000u l=150000u
-+  ad=6.804e+11p pd=6.66e+06u as=7.056e+11p ps=6.72e+06u
-M1001 VPWR A1 a_487_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.3734e+12p pd=1.226e+07u as=1.0206e+12p ps=9.18e+06u
-M1002 a_286_65# B1 a_31_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=6.804e+11p ps=6.66e+06u
-M1003 VPWR B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.0584e+12p ps=9.24e+06u
-M1004 a_487_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A2 a_286_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_31_65# B1 a_286_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_487_367# A2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y C1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y C1 a_31_65# VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1010 a_31_65# C1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_286_65# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A2 a_487_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_286_65# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_487_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND A2 a_286_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_286_65# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_31_65# B1 a_286_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_286_65# B1 a_31_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_286_65# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_487_367# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 Y A2 a_487_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND A1 a_286_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_487_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_31_65# C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 Y C1 a_31_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_4.cdl b/cells/o211ai/sky130_fd_sc_lp__o211ai_4.cdl
index 9dd55bc..dbda81b 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_4.cdl
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=4 w=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 phighvt m=4 w=1.26 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.84 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=4 w=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_lp__o211ai_4
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_4.netlist.tsv b/cells/o211ai/sky130_fd_sc_lp__o211ai_4.netlist.tsv
index c912379..fe8e58e 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_4.netlist.tsv
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	4	0.84	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	4	1.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_4.spice b/cells/o211ai/sky130_fd_sc_lp__o211ai_4.spice
index 17fff0d..dace9ca 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_4.spice
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_lp__o211ai_4 A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 Y B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.1168e+12p pd=1.848e+07u as=2.9106e+12p ps=2.226e+07u
-M1001 a_836_47# B1 a_57_47# VNB nshort w=840000u l=150000u
-+  ad=1.4985e+12p pd=1.072e+07u as=1.6632e+12p ps=1.572e+07u
-M1002 a_57_47# B1 a_836_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_836_47# C1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1004 a_140_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=0p ps=0u
-M1005 VPWR A1 a_140_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A2 a_57_47# VNB nshort w=840000u l=150000u
-+  ad=9.492e+11p pd=8.98e+06u as=0p ps=0u
-M1007 VPWR B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_57_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y C1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A1 a_57_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_140_367# A2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A1 a_140_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_836_47# B1 a_57_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_57_47# B1 a_836_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y C1 a_836_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_57_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_140_367# A2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND A1 a_57_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y A2 a_140_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_836_47# C1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_57_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y C1 a_836_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y A2 a_140_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 Y B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_57_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_57_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 Y C1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_140_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y C1 a_836_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 Y A2 a_140_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR A1 a_140_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_836_47# B1 a_57_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VGND A1 a_57_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_140_367# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 Y A2 a_140_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_836_47# C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_57_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VGND A1 a_57_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_57_47# B1 a_836_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_836_47# C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 Y C1 a_836_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_140_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_140_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 a_57_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 VGND A2 a_57_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 a_57_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 a_836_47# B1 a_57_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 VGND A2 a_57_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 a_57_47# B1 a_836_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 a_140_367# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 VPWR A1 a_140_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 a_57_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.cdl b/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.cdl
index 27ca1cd..21da9a4 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.cdl
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__o211ai_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMPC0 VPWR C1 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
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=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_lp__o211ai_lp
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.netlist.tsv b/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.netlist.tsv
index 74e3669..63e24ef 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.netlist.tsv
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__o211ai_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.spice b/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.spice
index 477f722..ccbd0ba 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.spice
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__o211ai_lp A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 Y C1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=6.05e+11p pd=5.21e+06u as=6.05e+11p ps=5.21e+06u
-M1001 a_329_57# B1 a_38_57# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.373e+11p ps=2.81e+06u
-M1002 Y C1 a_329_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1003 Y A2 a_137_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1004 VGND A1 a_38_57# VNB nshort w=420000u l=150000u
-+  ad=1.848e+11p pd=1.72e+06u as=0p ps=0u
-M1005 a_38_57# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR B1 Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_137_409# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A2 a_38_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_38_57# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_329_57# C1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR A1 a_137_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_137_409# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_38_57# B1 a_329_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_m.cdl b/cells/o211ai/sky130_fd_sc_lp__o211ai_m.cdl
index 1e8f1cd..fb0b5fd 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_m.cdl
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_m.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__o211ai_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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.42 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.42 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.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=0.42 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=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_lp__o211ai_m
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_m.netlist.tsv b/cells/o211ai/sky130_fd_sc_lp__o211ai_m.netlist.tsv
index 99aad86..aedf962 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_m.netlist.tsv
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_m.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__o211ai_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_m.spice b/cells/o211ai/sky130_fd_sc_lp__o211ai_m.spice
index e67ac29..65459f8 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_m.spice
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_m.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__o211ai_m A1 A2 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_148_535# A1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.457e+11p ps=2.85e+06u
-M1001 Y C1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=0p ps=0u
-M1002 a_29_47# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=1.344e+11p ps=1.48e+06u
-M1003 VPWR B1 Y VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A2 a_148_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_292_47# B1 a_29_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1006 Y C1 a_292_47# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1007 VGND A1 a_29_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_148_535# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VPWR A1 a_148_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_292_47# C1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND A2 a_29_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_29_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_29_47# B1 a_292_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_0.cdl b/cells/o21a/sky130_fd_sc_lp__o21a_0.cdl
index 983231b..f774d65 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_0.cdl
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_0.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__o21a_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMIPX X y 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o21a_0
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_0.netlist.tsv b/cells/o21a/sky130_fd_sc_lp__o21a_0.netlist.tsv
index 9d445ac..c415241 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_0.netlist.tsv
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_0.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__o21a_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	0.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o21a/sky130_fd_sc_lp__o21a_0.spice b/cells/o21a/sky130_fd_sc_lp__o21a_0.spice
index a288795..65b64d6 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_0.spice
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_0.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__o21a_0 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 VPWR A1 a_337_483# VPB phighvt w=640000u l=150000u
-+  ad=3.84e+11p pd=3.76e+06u as=1.344e+11p ps=1.7e+06u
-M1001 a_300_58# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=2.289e+11p ps=2.77e+06u
-M1002 a_300_58# B1 a_80_23# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1003 VPWR a_80_23# X VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1004 VGND a_80_23# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 a_337_483# A2 a_80_23# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.144e+11p ps=1.95e+06u
-M1006 a_80_23# B1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_300_58# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_80_23# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_80_23# B1 a_300_58# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_80_23# A2 a_337_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 X a_80_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 VPWR B1 a_80_23# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_300_58# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND A1 a_300_58# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_337_483# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_1.cdl b/cells/o21a/sky130_fd_sc_lp__o21a_1.cdl
index 27ba85a..18f655a 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_1.cdl
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o21a_1
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_1.netlist.tsv b/cells/o21a/sky130_fd_sc_lp__o21a_1.netlist.tsv
index f54b60a..54a3eb8 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_1.netlist.tsv
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_1.spice b/cells/o21a/sky130_fd_sc_lp__o21a_1.spice
index afbee24..c5bec76 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_1.spice
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__o21a_1 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 VGND A2 a_300_51# VNB nshort w=840000u l=150000u
-+  ad=5.418e+11p pd=4.65e+06u as=4.578e+11p ps=4.45e+06u
-M1001 a_420_367# A2 a_80_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=4.914e+11p ps=3.3e+06u
-M1002 VPWR a_80_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.1781e+12p pd=6.91e+06u as=3.339e+11p ps=3.05e+06u
-M1003 VGND a_80_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1004 VPWR A1 a_420_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_300_51# B1 a_80_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1006 a_300_51# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_80_21# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_300_51# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_80_21# A2 a_420_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_420_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VPWR B1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND A1 a_300_51# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_80_21# B1 a_300_51# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_2.cdl b/cells/o21a/sky130_fd_sc_lp__o21a_2.cdl
index a43ce5e..c1741ca 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_2.cdl
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 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_lp__o21a_2
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_2.netlist.tsv b/cells/o21a/sky130_fd_sc_lp__o21a_2.netlist.tsv
index c66440b..41a4282 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_2.netlist.tsv
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_2.spice b/cells/o21a/sky130_fd_sc_lp__o21a_2.spice
index c47fb75..e191765 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_2.spice
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o21a_2 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 a_392_51# B1 a_86_21# VNB nshort w=840000u l=150000u
-+  ad=4.578e+11p pd=4.45e+06u as=2.226e+11p ps=2.21e+06u
-M1001 a_86_21# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=1.6758e+12p ps=1.022e+07u
-M1002 a_392_51# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=7.14e+11p ps=6.74e+06u
-M1003 X a_86_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1004 X a_86_21# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1005 VGND a_86_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A2 a_392_51# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A1 a_478_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=4.032e+11p ps=3.16e+06u
-M1008 VPWR a_86_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_478_367# A2 a_86_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_86_21# B1 a_392_51# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_478_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR B1 a_86_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_86_21# A2 a_478_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND a_86_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_392_51# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR a_86_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 X a_86_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 X a_86_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VGND A1 a_392_51# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_4.cdl b/cells/o21a/sky130_fd_sc_lp__o21a_4.cdl
index 4591d5c..d554381 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_4.cdl
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 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 phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 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=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
-MMNA1 pndA A2 VNB nshort 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
-MMNB0 y B1 VNB nshort 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
-MMINX X y VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=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_lp__o21a_4
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_4.netlist.tsv b/cells/o21a/sky130_fd_sc_lp__o21a_4.netlist.tsv
index 36c0cd1..bbad9c4 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_4.netlist.tsv
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_4.spice b/cells/o21a/sky130_fd_sc_lp__o21a_4.spice
index 2b61062..0753a69 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_4.spice
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_4.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__o21a_4 A1 A2 B1 VGND VNB VPB VPWR X
-M1000 a_792_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=2.3058e+12p ps=1.626e+07u
-M1001 X a_90_23# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=1.218e+12p ps=1.13e+07u
-M1002 VPWR a_90_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1003 VGND a_90_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_90_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_485_65# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=1.0668e+12p pd=9.26e+06u as=0p ps=0u
-M1006 a_792_367# A2 a_90_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1007 a_90_23# B1 a_485_65# VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1008 VPWR B1 a_90_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_90_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_90_23# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A2 a_485_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_90_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_485_65# B1 a_90_23# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_90_23# A2 a_792_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A1 a_792_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_485_65# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_90_23# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_90_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND A1 a_485_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_90_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VPWR B1 a_90_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR a_90_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR A1 a_792_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_792_367# A2 a_90_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND A1 a_485_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_90_23# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VPWR a_90_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_792_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 X a_90_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 X a_90_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_90_23# A2 a_792_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VGND a_90_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_485_65# B1 a_90_23# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_90_23# B1 a_485_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_485_65# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 X a_90_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 VGND A2 a_485_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_485_65# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 X a_90_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_lp.cdl b/cells/o21a/sky130_fd_sc_lp__o21a_lp.cdl
index 337f184..cb2be0b 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_lp.cdl
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_lp.cdl
@@ -16,22 +16,22 @@
 
 .SUBCKT sky130_fd_sc_lp__o21a_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMIPX X y 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX net45 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX net45 y VNB nshort m=1 w=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 X y VNB nshort m=1 w=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_lp__o21a_lp
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_lp.netlist.tsv b/cells/o21a/sky130_fd_sc_lp__o21a_lp.netlist.tsv
index 01405be..83baf13 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_lp.netlist.tsv
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_lp.netlist.tsv
@@ -1,11 +1,11 @@
 sky130_fd_sc_lp__o21a_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	net45	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	X	y	net45	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	net45	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	X	y	net45	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_lp.spice b/cells/o21a/sky130_fd_sc_lp__o21a_lp.spice
index 9adc7cb..4e5aea1 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_lp.spice
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_lp.spice
@@ -16,22 +16,13 @@
 
 
 .subckt sky130_fd_sc_lp__o21a_lp A1 A2 B1 VGND VNB VPB VPWR X
-M1000 a_146_409# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=5.65e+11p ps=5.13e+06u
-M1001 VPWR B1 a_244_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=5.8e+11p ps=3.16e+06u
-M1002 a_244_409# A2 a_146_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_27_57# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=2.709e+11p pd=2.97e+06u as=2.709e+11p ps=2.97e+06u
-M1004 VGND A1 a_27_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_244_409# B1 a_27_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1006 X a_244_409# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1007 a_516_47# a_244_409# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1008 X a_244_409# a_516_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
+X0 a_516_47# a_244_409# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_244_409# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 VGND A2 a_27_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR A1 a_146_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_146_409# A2 a_244_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_27_57# B1 a_244_409# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_244_409# a_516_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_244_409# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_27_57# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_m.cdl b/cells/o21a/sky130_fd_sc_lp__o21a_m.cdl
index 6daae42..17d73da 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_m.cdl
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_m.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__o21a_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o21a_m
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_m.netlist.tsv b/cells/o21a/sky130_fd_sc_lp__o21a_m.netlist.tsv
index c5a8c38..3f409cb 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_m.netlist.tsv
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_m.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__o21a_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o21a/sky130_fd_sc_lp__o21a_m.spice b/cells/o21a/sky130_fd_sc_lp__o21a_m.spice
index b342392..e53e03d 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_m.spice
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_m.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__o21a_m A1 A2 B1 VGND VNB VPB VPWR X
-M1000 VPWR a_80_23# X VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=1.113e+11p ps=1.37e+06u
-M1001 a_340_535# A2 a_80_23# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1002 VGND a_80_23# X VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=1.113e+11p ps=1.37e+06u
-M1003 VGND A2 a_300_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.289e+11p ps=2.77e+06u
-M1004 a_300_74# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_80_23# B1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_300_74# B1 a_80_23# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 VPWR A1 a_340_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B1 a_80_23# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_300_74# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND A1 a_300_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 X a_80_23# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_80_23# A2 a_340_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 X a_80_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_340_535# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_80_23# B1 a_300_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_0.cdl b/cells/o21ai/sky130_fd_sc_lp__o21ai_0.cdl
index 779947a..0927dfe 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_0.cdl
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_0.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__o21ai_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o21ai_0
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_0.netlist.tsv b/cells/o21ai/sky130_fd_sc_lp__o21ai_0.netlist.tsv
index dfddce7..287bf93 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_0.netlist.tsv
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_0.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__o21ai_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	0.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_0.spice b/cells/o21ai/sky130_fd_sc_lp__o21ai_0.spice
index 047a503..fd06d81 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_0.spice
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_0.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__o21ai_0 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 Y B1 a_39_47# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=2.289e+11p ps=2.77e+06u
-M1001 VPWR B1 Y VPB phighvt w=640000u l=150000u
-+  ad=3.392e+11p pd=3.62e+06u as=1.792e+11p ps=1.84e+06u
-M1002 VGND A1 a_39_47# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1003 a_130_483# A1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1004 Y A2 a_130_483# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_39_47# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A2 a_39_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_39_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_130_483# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_39_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR A1 a_130_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_1.cdl b/cells/o21ai/sky130_fd_sc_lp__o21ai_1.cdl
index 9606c2d..1076f0a 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_1.cdl
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 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.84 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.84 l=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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o21ai_1
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_1.netlist.tsv b/cells/o21ai/sky130_fd_sc_lp__o21ai_1.netlist.tsv
index fddc6f2..bdf992d 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_1.netlist.tsv
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_1.spice b/cells/o21ai/sky130_fd_sc_lp__o21ai_1.spice
index 87565be..473e3d7 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_1.spice
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__o21ai_1 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 a_29_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=4.578e+11p pd=4.45e+06u as=3.192e+11p ps=2.44e+06u
-M1001 Y A2 a_112_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=5.67e+11p pd=3.42e+06u as=2.646e+11p ps=2.94e+06u
-M1002 a_112_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=6.678e+11p ps=6.1e+06u
-M1003 VGND A1 a_29_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y B1 a_29_47# VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
+X0 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_112_367# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR A1 a_112_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_29_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND A2 a_29_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_29_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_2.cdl b/cells/o21ai/sky130_fd_sc_lp__o21ai_2.cdl
index 925e08d..1e39c70 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_2.cdl
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.26 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.84 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.84 l=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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 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_lp__o21ai_2
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_2.netlist.tsv b/cells/o21ai/sky130_fd_sc_lp__o21ai_2.netlist.tsv
index 871cab0..51d1581 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_2.netlist.tsv
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	2	0.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_2.spice b/cells/o21ai/sky130_fd_sc_lp__o21ai_2.spice
index a377ab6..3648311 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_2.spice
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o21ai_2 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 Y B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=1.071e+12p ps=9.26e+06u
-M1001 VGND A2 a_30_47# VNB nshort w=840000u l=150000u
-+  ad=6.342e+11p pd=4.87e+06u as=9.156e+11p ps=8.9e+06u
-M1002 Y A2 a_113_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=9.009e+11p ps=6.47e+06u
-M1003 VPWR A1 a_113_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B1 a_30_47# VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1005 VGND A1 a_30_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_113_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_30_47# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_30_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_30_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_113_367# A2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_113_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_30_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_113_367# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR A1 a_113_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND A1 a_30_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Y A2 a_113_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_30_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 Y B1 a_30_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VGND A2 a_30_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_30_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_4.cdl b/cells/o21ai/sky130_fd_sc_lp__o21ai_4.cdl
index f4ed980..1233c2b 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_4.cdl
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.84 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.26 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.84 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.84 l=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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=4 w=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_lp__o21ai_4
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_4.netlist.tsv b/cells/o21ai/sky130_fd_sc_lp__o21ai_4.netlist.tsv
index cc1ea97..e816070 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_4.netlist.tsv
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	4	0.84	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_4.spice b/cells/o21ai/sky130_fd_sc_lp__o21ai_4.spice
index 5508a9f..8f3a9a9 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_4.spice
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_lp__o21ai_4 A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 Y B1 a_32_47# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=1.6212e+12p ps=1.562e+07u
-M1001 a_115_367# A2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=1.4112e+12p ps=1.232e+07u
-M1002 Y B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.7766e+12p ps=1.542e+07u
-M1003 Y B1 a_32_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A2 a_32_47# VNB nshort w=840000u l=150000u
-+  ad=9.744e+11p pd=9.04e+06u as=0p ps=0u
-M1005 Y A2 a_115_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_115_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_32_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_32_47# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A2 a_115_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A1 a_32_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_115_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_115_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_32_47# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_32_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_32_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_32_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_32_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A1 a_115_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_115_367# A2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A1 a_32_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_115_367# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND A1 a_32_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 Y B1 a_32_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_115_367# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 Y B1 a_32_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_32_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_32_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND A2 a_32_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 Y A2 a_115_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR A1 a_115_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VPWR A1 a_115_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_32_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_115_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_32_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VGND A2 a_32_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_32_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 VGND A1 a_32_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 a_115_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 Y A2 a_115_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 a_32_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.cdl b/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.cdl
index 6e030fd..670f30b 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.cdl
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__o21ai_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o21ai_lp
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.netlist.tsv b/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.netlist.tsv
index a46dac3..3bfeede 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.netlist.tsv
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__o21ai_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.spice b/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.spice
index 6f90812..50faab3 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.spice
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__o21ai_lp A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 a_155_409# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=5.7e+11p ps=5.14e+06u
-M1001 VGND A1 a_64_57# VNB nshort w=420000u l=150000u
-+  ad=1.848e+11p pd=1.72e+06u as=2.373e+11p ps=2.81e+06u
-M1002 VPWR B1 Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=3.2e+11p ps=2.64e+06u
-M1003 a_64_57# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y A2 a_155_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y B1 a_64_57# VNB nshort w=420000u l=150000u
-+  ad=1.533e+11p pd=1.57e+06u as=0p ps=0u
+X0 VPWR A1 a_155_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_155_409# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_64_57# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND A2 a_64_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_64_57# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_m.cdl b/cells/o21ai/sky130_fd_sc_lp__o21ai_m.cdl
index bd6c4cf..1872ae1 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_m.cdl
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_m.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__o21ai_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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.42 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.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.42 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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o21ai_m
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_m.netlist.tsv b/cells/o21ai/sky130_fd_sc_lp__o21ai_m.netlist.tsv
index 1ba35a9..5073ca0 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_m.netlist.tsv
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_m.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__o21ai_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_m.spice b/cells/o21ai/sky130_fd_sc_lp__o21ai_m.spice
index 7c67464..2a556ff 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_m.spice
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_m.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__o21ai_m A1 A2 B1 VGND VNB VPB VPWR Y
-M1000 a_27_51# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=1.176e+11p ps=1.4e+06u
-M1001 VPWR B1 Y VPB phighvt w=420000u l=150000u
-+  ad=2.226e+11p pd=2.74e+06u as=1.638e+11p ps=1.62e+06u
-M1002 Y B1 a_27_51# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1003 Y A2 a_110_434# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1004 VGND A1 a_27_51# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_110_434# A1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_110_434# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_27_51# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR A1 a_110_434# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VGND A2 a_27_51# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_27_51# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_0.cdl b/cells/o21ba/sky130_fd_sc_lp__o21ba_0.cdl
index 54f8a2d..afea0f8 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_0.cdl
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o21ba_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=0.42 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=0.64 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o21ba_0
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_0.netlist.tsv b/cells/o21ba/sky130_fd_sc_lp__o21ba_0.netlist.tsv
index 6887761..d9e7003 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_0.netlist.tsv
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o21ba_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	0.64	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.64	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o21ba/sky130_fd_sc_lp__o21ba_0.spice b/cells/o21ba/sky130_fd_sc_lp__o21ba_0.spice
index f39d291..3400315 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_0.spice
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o21ba_0 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 a_499_47# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=3.78e+11p ps=3.48e+06u
-M1001 VPWR a_80_225# X VPB phighvt w=640000u l=150000u
-+  ad=6.581e+11p pd=6.12e+06u as=1.696e+11p ps=1.81e+06u
-M1002 VGND a_80_225# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1003 a_557_487# A2 a_80_225# VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.792e+11p ps=1.84e+06u
-M1004 a_499_47# a_258_397# a_80_225# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 a_80_225# a_258_397# VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_258_397# B1_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1007 a_258_397# B1_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1008 VGND A2 a_499_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A1 a_557_487# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_499_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND A1 a_499_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 X a_80_225# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_557_487# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 X a_80_225# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 VPWR B1_N a_258_397# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_80_225# A2 a_557_487# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 VPWR a_258_397# a_80_225# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 VGND B1_N a_258_397# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_80_225# a_258_397# a_499_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_1.cdl b/cells/o21ba/sky130_fd_sc_lp__o21ba_1.cdl
index 4c8b232..ea31324 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_1.cdl
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.42 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.26 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.84 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.84 l=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.84 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o21ba_1
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_1.netlist.tsv b/cells/o21ba/sky130_fd_sc_lp__o21ba_1.netlist.tsv
index baa2475..ac17cd0 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_1.netlist.tsv
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_1.spice b/cells/o21ba/sky130_fd_sc_lp__o21ba_1.spice
index 90e52f3..e250afc 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_1.spice
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o21ba_1 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 a_281_138# B1_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=1.0941e+12p ps=9.59e+06u
-M1001 a_84_28# a_281_138# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.78e+11p pd=3.12e+06u as=0p ps=0u
-M1002 a_494_51# a_281_138# a_84_28# VNB nshort w=840000u l=150000u
-+  ad=4.578e+11p pd=4.45e+06u as=2.226e+11p ps=2.21e+06u
-M1003 a_584_367# A2 a_84_28# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.536e+11p pd=3.24e+06u as=0p ps=0u
-M1004 VPWR A1 a_584_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_84_28# X VNB nshort w=840000u l=150000u
-+  ad=7.35e+11p pd=5.49e+06u as=2.394e+11p ps=2.25e+06u
-M1006 a_281_138# B1_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.554e+11p pd=1.58e+06u as=0p ps=0u
-M1007 VGND A2 a_494_51# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_84_28# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1009 a_494_51# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_84_28# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND A1 a_494_51# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_84_28# A2 a_584_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_84_28# a_281_138# a_494_51# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND B1_N a_281_138# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_494_51# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 X a_84_28# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VPWR B1_N a_281_138# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_584_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR a_281_138# a_84_28# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_2.cdl b/cells/o21ba/sky130_fd_sc_lp__o21ba_2.cdl
index 0f0ecd3..cd0fa25 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_2.cdl
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.42 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.26 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.84 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.84 l=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.84 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 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_lp__o21ba_2
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_2.netlist.tsv b/cells/o21ba/sky130_fd_sc_lp__o21ba_2.netlist.tsv
index 6454df6..5f1f10c 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_2.netlist.tsv
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_2.spice b/cells/o21ba/sky130_fd_sc_lp__o21ba_2.spice
index c1bad0a..4590b94 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_2.spice
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o21ba_2 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 a_186_21# a_28_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.654e+11p pd=3.1e+06u as=1.3125e+12p ps=9.95e+06u
-M1001 X a_186_21# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=7.938e+11p ps=7.04e+06u
-M1002 VGND A2 a_492_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.746e+11p ps=4.49e+06u
-M1003 a_492_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A1 a_564_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=5.355e+11p ps=3.37e+06u
-M1005 VGND a_186_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_564_367# A2 a_186_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_492_47# a_28_131# a_186_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1008 VGND B1_N a_28_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1009 VPWR a_186_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1010 VPWR B1_N a_28_131# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1011 X a_186_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_186_21# a_28_131# a_492_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND A1 a_492_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_28_131# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_492_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR a_28_131# a_186_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_28_131# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_186_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 X a_186_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 X a_186_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_186_21# A2 a_564_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR a_186_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_564_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_4.cdl b/cells/o21ba/sky130_fd_sc_lp__o21ba_4.cdl
index f882ccc..745b676 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_4.cdl
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 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 phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 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 phighvt m=4 w=1.26 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.84 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.84 l=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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=4 w=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_lp__o21ba_4
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_4.netlist.tsv b/cells/o21ba/sky130_fd_sc_lp__o21ba_4.netlist.tsv
index 75514c0..c5929fc 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_4.netlist.tsv
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	2	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_4.spice b/cells/o21ba/sky130_fd_sc_lp__o21ba_4.spice
index 6d2c337..1c96ee3 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_4.spice
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_4.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_lp__o21ba_4 A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 VPWR a_180_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.7153e+12p pd=1.691e+07u as=7.056e+11p ps=6.16e+06u
-M1001 a_575_65# a_37_49# a_180_23# VNB nshort w=840000u l=150000u
-+  ad=1.0668e+12p pd=9.26e+06u as=2.352e+11p ps=2.24e+06u
-M1002 X a_180_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_180_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_180_23# A2 a_878_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=7.056e+11p ps=6.16e+06u
-M1005 VGND A1 a_575_65# VNB nshort w=840000u l=150000u
-+  ad=1.2306e+12p pd=1.133e+07u as=0p ps=0u
-M1006 a_180_23# a_37_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_180_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1008 a_575_65# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_180_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A1 a_878_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_37_49# a_180_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_575_65# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_180_23# a_37_49# a_575_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_878_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_878_367# A2 a_180_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_180_23# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A2 a_575_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_180_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_180_23# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND B1_N a_37_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.25e+06u
-M1021 VPWR B1_N a_37_49# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 X a_180_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND a_180_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR A1 a_878_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_37_49# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 X a_180_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VPWR a_180_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 X a_180_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VGND a_180_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_575_65# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_180_23# a_37_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_878_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_180_23# A2 a_878_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_878_367# A2 a_180_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_575_65# a_37_49# a_180_23# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_180_23# a_37_49# a_575_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 X a_180_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_575_65# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 VGND A1 a_575_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 VPWR a_37_49# a_180_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_37_49# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 VPWR a_180_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 VGND A2 a_575_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.cdl b/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.cdl
index d26e68a..6e631f9 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.cdl
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__o21ba_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMIPB1N B1 B1_N 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
+MMIPX X y 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net63 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=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 net63 y VNB nshort m=1 w=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 net59 B1_N VNB nshort m=1 w=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 net59 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o21ba_lp
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.netlist.tsv b/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.netlist.tsv
index 59665ce..7d49532 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.netlist.tsv
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__o21ba_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	net59	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	net63	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net63	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net59	B1_N	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1	0.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	net59	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	net63	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net63	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net59	B1_N	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/o21ba/sky130_fd_sc_lp__o21ba_lp.spice b/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.spice
index 776920b..d33bdb6 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.spice
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o21ba_lp A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 a_317_29# B1_N VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=1.0535e+12p ps=8.32e+06u
-M1001 VGND A1 a_34_55# VNB nshort w=420000u l=150000u
-+  ad=3.024e+11p pd=3.12e+06u as=2.835e+11p ps=3.03e+06u
-M1002 a_34_55# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND B1_N a_550_75# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1004 a_155_389# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1005 a_253_389# a_317_29# a_34_55# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1006 X a_253_389# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1007 a_550_75# B1_N a_317_29# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1008 VPWR a_317_29# a_253_389# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=3.2e+11p ps=2.64e+06u
-M1009 X a_253_389# a_708_75# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1010 a_253_389# A2 a_155_389# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_708_75# a_253_389# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B1_N a_317_29# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_708_75# a_253_389# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_317_29# B1_N a_550_75# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_550_75# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR a_253_389# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 VPWR A1 a_155_389# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 VGND A2 a_34_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_34_55# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_34_55# a_317_29# a_253_389# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_155_389# A2 a_253_389# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 VGND a_253_389# a_708_75# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_253_389# a_317_29# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_m.cdl b/cells/o21ba/sky130_fd_sc_lp__o21ba_m.cdl
index 3376919..af9b86d 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_m.cdl
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o21ba_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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.42 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.26 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=0.42 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.42 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.42 l=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.42 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.84 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o21ba_m
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_m.netlist.tsv b/cells/o21ba/sky130_fd_sc_lp__o21ba_m.netlist.tsv
index cbae927..84fdd92 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_m.netlist.tsv
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o21ba_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	0.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.42	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o21ba/sky130_fd_sc_lp__o21ba_m.spice b/cells/o21ba/sky130_fd_sc_lp__o21ba_m.spice
index fe98e31..92796e5 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_m.spice
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o21ba_m A1 A2 B1_N VGND VNB VPB VPWR X
-M1000 VPWR a_88_41# X VPB phighvt w=420000u l=150000u
-+  ad=6.027e+11p pd=6.01e+06u as=1.113e+11p ps=1.37e+06u
-M1001 VPWR A1 a_532_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1002 VGND A2 a_500_49# VNB nshort w=420000u l=150000u
-+  ad=3.801e+11p pd=3.83e+06u as=2.289e+11p ps=2.77e+06u
-M1003 a_532_535# A2 a_88_41# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1004 VGND a_88_41# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 a_256_79# B1_N VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1006 a_500_49# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_500_49# a_256_79# a_88_41# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1008 a_256_79# B1_N VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1009 a_88_41# a_256_79# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_88_41# A2 a_532_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VPWR B1_N a_256_79# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_88_41# a_256_79# a_500_49# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND B1_N a_256_79# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_532_535# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_500_49# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND A1 a_500_49# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_256_79# a_88_41# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 X a_88_41# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 X a_88_41# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_0.cdl b/cells/o21bai/sky130_fd_sc_lp__o21bai_0.cdl
index 3450731..7cf6d06 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_0.cdl
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_0.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__o21bai_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMIPB1N B1 B1_N VPB pfet_01v8_hvt m=1 w=0.42 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.42 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB phighvt m=1 w=0.42 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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o21bai_0
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_0.netlist.tsv b/cells/o21bai/sky130_fd_sc_lp__o21bai_0.netlist.tsv
index b628130..1087ba9 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_0.netlist.tsv
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_0.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__o21bai_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	0.64	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.64	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_0.spice b/cells/o21bai/sky130_fd_sc_lp__o21bai_0.spice
index aa68a17..dbe60e2 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_0.spice
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_0.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__o21bai_0 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 VPWR A1 a_406_473# VPB phighvt w=640000u l=150000u
-+  ad=3.875e+11p pd=3.85e+06u as=1.536e+11p ps=1.76e+06u
-M1001 VGND A2 a_320_47# VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=2.289e+11p ps=2.77e+06u
-M1002 VPWR B1_N a_39_51# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1003 a_320_47# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_406_473# A2 Y VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1005 a_320_47# a_39_51# Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 Y a_39_51# VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B1_N a_39_51# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 VGND A1 a_320_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR a_39_51# Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 Y A2 a_406_473# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_39_51# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_39_51# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_406_473# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 Y a_39_51# a_320_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_320_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_1.cdl b/cells/o21bai/sky130_fd_sc_lp__o21bai_1.cdl
index 9b96e7e..ee6bb8f 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_1.cdl
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.42 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB phighvt m=1 w=0.42 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.84 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.84 l=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.84 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o21bai_1
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_1.netlist.tsv b/cells/o21bai/sky130_fd_sc_lp__o21bai_1.netlist.tsv
index ff193df..2cfc118 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_1.netlist.tsv
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.42	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.26	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.26	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.26	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_1.spice b/cells/o21bai/sky130_fd_sc_lp__o21bai_1.spice
index 595be36..9740fcc 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_1.spice
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__o21bai_1 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 VPWR B1_N a_27_69# VPB phighvt w=420000u l=150000u
-+  ad=7.14e+11p pd=6.32e+06u as=1.113e+11p ps=1.37e+06u
-M1001 VPWR A1 a_424_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=2.646e+11p ps=2.94e+06u
-M1002 VGND A2 a_310_47# VNB nshort w=840000u l=150000u
-+  ad=4.011e+11p pd=3.74e+06u as=4.62e+11p ps=4.46e+06u
-M1003 Y a_27_69# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=5.292e+11p pd=3.36e+06u as=0p ps=0u
-M1004 a_310_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND B1_N a_27_69# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 a_310_47# a_27_69# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1007 a_424_367# A2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_27_69# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_27_69# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND A1 a_310_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_27_69# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 Y a_27_69# a_310_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_310_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Y A2 a_424_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_424_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_2.cdl b/cells/o21bai/sky130_fd_sc_lp__o21bai_2.cdl
index 14abba1..96a249c 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_2.cdl
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.42 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 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 phighvt m=1 w=0.42 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.84 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.84 l=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.84 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o21bai_2
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_2.netlist.tsv b/cells/o21bai/sky130_fd_sc_lp__o21bai_2.netlist.tsv
index 4c1d38a..d8300e3 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_2.netlist.tsv
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.42	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.26	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.26	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.26	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	2	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_2.spice b/cells/o21bai/sky130_fd_sc_lp__o21bai_2.spice
index aa829a4..bde4267 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_2.spice
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__o21bai_2 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 VGND A2 a_233_65# VNB nshort w=840000u l=150000u
-+  ad=6.489e+11p pd=6.01e+06u as=9.324e+11p ps=8.94e+06u
-M1001 VPWR A1 a_504_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.2264e+12p pd=9.84e+06u as=7.056e+11p ps=6.16e+06u
-M1002 VPWR a_100_367# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1003 a_504_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A1 a_233_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_233_65# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y a_100_367# a_233_65# VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1007 a_233_65# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_504_367# A2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_100_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR B1_N a_100_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1011 Y A2 a_504_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_233_65# a_100_367# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_100_367# B1_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 VPWR a_100_367# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_504_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_233_65# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VGND A1 a_233_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 Y a_100_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_100_367# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VGND B1_N a_100_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR A1 a_504_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_233_65# a_100_367# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 Y a_100_367# a_233_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 Y A2 a_504_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VGND A2 a_233_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_504_367# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_233_65# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_4.cdl b/cells/o21bai/sky130_fd_sc_lp__o21bai_4.cdl
index 73922ce..348615b 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_4.cdl
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=4 w=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 phighvt m=1 w=1.26 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.84 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.84 l=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.84 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.84 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.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_lp__o21bai_4
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_4.netlist.tsv b/cells/o21bai/sky130_fd_sc_lp__o21bai_4.netlist.tsv
index fdc7bcc..f11cb89 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_4.netlist.tsv
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.84	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	4	1.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	4	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_4.spice b/cells/o21bai/sky130_fd_sc_lp__o21bai_4.spice
index f6ae4e2..227aeb8 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_4.spice
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_4.spice
@@ -16,56 +16,30 @@
 
 
 .subckt sky130_fd_sc_lp__o21bai_4 A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 a_218_49# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=1.6674e+12p pd=1.573e+07u as=1.1634e+12p ps=1.117e+07u
-M1001 VPWR a_27_49# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.3877e+12p pd=1.639e+07u as=1.4112e+12p ps=1.232e+07u
-M1002 VGND A1 a_218_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y a_27_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_653_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=0p ps=0u
-M1005 VGND A1 a_218_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_218_49# a_27_49# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1007 Y A2 a_653_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_218_49# a_27_49# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B1_N a_27_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1010 VGND A2 a_218_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y a_27_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_218_49# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A1 a_653_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A2 a_653_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y a_27_49# a_218_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A2 a_218_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_653_367# A2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y a_27_49# a_218_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A1 a_653_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_218_49# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_27_49# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_218_49# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_653_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR B1_N a_27_49# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1025 a_653_367# A2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_653_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 Y a_27_49# a_218_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_653_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_218_49# a_27_49# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_653_367# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 Y A2 a_653_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VPWR A1 a_653_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_653_367# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_27_49# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 Y a_27_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_27_49# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VPWR a_27_49# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_653_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 Y a_27_49# a_218_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 VGND A1 a_218_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_218_49# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_218_49# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 VGND A2 a_218_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_218_49# a_27_49# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 a_218_49# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 Y A2 a_653_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 a_218_49# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 Y a_27_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 VGND A2 a_218_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 VGND A1 a_218_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 VPWR a_27_49# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.cdl b/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.cdl
index e23dab7..948950a 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.cdl
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.cdl
@@ -16,22 +16,22 @@
 
 .SUBCKT sky130_fd_sc_lp__o21bai_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMIPB1N B1 B1_N 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
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net50 B1_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net50 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o21bai_lp
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.netlist.tsv b/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.netlist.tsv
index b3ba6a2..4075c84 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.netlist.tsv
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.netlist.tsv
@@ -1,11 +1,11 @@
 sky130_fd_sc_lp__o21bai_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	net50	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net50	B1_N	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	1	1	0.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINB1N	MOSFET	B1	B1_N	net50	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net50	B1_N	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/o21bai/sky130_fd_sc_lp__o21bai_lp.spice b/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.spice
index d14d31b..e2f0d92 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.spice
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.spice
@@ -16,22 +16,13 @@
 
 
 .subckt sky130_fd_sc_lp__o21bai_lp A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 Y A2 a_140_413# VPB phighvt w=1e+06u l=250000u
-+  ad=2.8e+11p pd=2.56e+06u as=2.1e+11p ps=2.42e+06u
-M1001 a_288_21# B1_N VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=8.25e+11p ps=5.78e+06u
-M1002 a_140_413# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A1 a_28_110# VNB nshort w=420000u l=150000u
-+  ad=3.024e+11p pd=3.12e+06u as=2.373e+11p ps=2.81e+06u
-M1004 Y a_288_21# a_28_110# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1005 VPWR a_288_21# Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_28_110# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_516_47# B1_N VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1008 a_288_21# B1_N a_516_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
+X0 a_516_47# B1_N a_288_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_140_413# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 VGND A2 a_28_110# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND B1_N a_516_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 Y a_288_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_28_110# a_288_21# Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_28_110# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR A1 a_140_413# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 VPWR B1_N a_288_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_m.cdl b/cells/o21bai/sky130_fd_sc_lp__o21bai_m.cdl
index b9bd7c0..5c9ec28 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_m.cdl
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_m.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__o21bai_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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.42 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.42 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.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPB1N B1 B1_N VPB phighvt m=1 w=0.42 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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
+MMINB1N B1 B1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o21bai_m
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_m.netlist.tsv b/cells/o21bai/sky130_fd_sc_lp__o21bai_m.netlist.tsv
index fb80a47..626a5fc 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_m.netlist.tsv
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_m.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__o21bai_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPB1N	MOSFET	B1	B1_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINB1N	MOSFET	B1	B1_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_m.spice b/cells/o21bai/sky130_fd_sc_lp__o21bai_m.spice
index a0342d1..6187af3 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_m.spice
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_m.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__o21bai_m A1 A2 B1_N VGND VNB VPB VPWR Y
-M1000 a_320_78# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=2.289e+11p ps=2.77e+06u
-M1001 a_320_78# a_32_62# Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1002 VGND B1_N a_32_62# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1003 a_315_535# A2 Y VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1004 VPWR A1 a_315_535# VPB phighvt w=420000u l=150000u
-+  ad=2.835e+11p pd=3.03e+06u as=0p ps=0u
-M1005 VPWR B1_N a_32_62# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 VGND A2 a_320_78# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y a_32_62# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_32_62# a_320_78# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR a_32_62# Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_320_78# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y A2 a_315_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_315_535# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VGND A1 a_320_78# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_32_62# B1_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_32_62# B1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_0.cdl b/cells/o221a/sky130_fd_sc_lp__o221a_0.cdl
index 33e831a..f81c756 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_0.cdl
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_0.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__o221a_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMPB1 sndB1 B2 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
+MMPC0 VPWR C1 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
+MMIPX X y 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.42 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.42 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o221a_0
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_0.netlist.tsv b/cells/o221a/sky130_fd_sc_lp__o221a_0.netlist.tsv
index bc9aaa8..7dc48ae 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_0.netlist.tsv
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_0.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__o221a_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	1	0.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o221a/sky130_fd_sc_lp__o221a_0.spice b/cells/o221a/sky130_fd_sc_lp__o221a_0.spice
index e23307e..81d904e 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_0.spice
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_0.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o221a_0 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 a_127_106# B2 a_213_106# VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=2.352e+11p ps=2.8e+06u
-M1001 a_213_106# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.646e+11p ps=2.94e+06u
-M1002 a_32_484# B2 a_269_484# VPB phighvt w=640000u l=150000u
-+  ad=4.192e+11p pd=3.87e+06u as=1.344e+11p ps=1.7e+06u
-M1003 a_269_484# B1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=7.936e+11p ps=5.04e+06u
-M1004 VPWR A1 a_449_484# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.7e+06u
-M1005 VPWR C1 a_32_484# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_32_484# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1007 a_213_106# B1 a_127_106# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_127_106# C1 a_32_484# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1009 VGND A1 a_213_106# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_32_484# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1011 a_449_484# A2 a_32_484# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_449_484# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_32_484# C1 a_127_106# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_32_484# A2 a_449_484# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_213_106# B2 a_127_106# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_32_484# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR B1 a_269_484# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 VGND A2 a_213_106# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_127_106# B1 a_213_106# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_213_106# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_269_484# B2 a_32_484# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X10 a_32_484# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 VPWR a_32_484# X VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_1.cdl b/cells/o221a/sky130_fd_sc_lp__o221a_1.cdl
index ef3ff19..624494f 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_1.cdl
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 pndB B2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o221a_1
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_1.netlist.tsv b/cells/o221a/sky130_fd_sc_lp__o221a_1.netlist.tsv
index 03c85c6..86dc5dc 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_1.netlist.tsv
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_1.spice b/cells/o221a/sky130_fd_sc_lp__o221a_1.spice
index d65a288..2c9863e 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_1.spice
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o221a_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 a_96_49# B2 a_287_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.3041e+12p pd=7.11e+06u as=3.024e+11p ps=3e+06u
-M1001 a_549_367# A2 a_96_49# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1002 a_179_49# C1 a_96_49# VNB nshort w=840000u l=150000u
-+  ad=4.914e+11p pd=4.53e+06u as=2.226e+11p ps=2.21e+06u
-M1003 VPWR C1 a_96_49# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0269e+12p pd=6.67e+06u as=0p ps=0u
-M1004 a_179_49# B2 a_273_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1005 X a_96_49# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=4.914e+11p ps=4.53e+06u
-M1006 a_287_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_273_49# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A1 a_549_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_96_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1010 a_273_49# B1 a_179_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A1 a_273_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_273_49# B2 a_179_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_549_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_96_49# C1 a_179_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_287_367# B2 a_96_49# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_96_49# A2 a_549_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND A2 a_273_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_273_49# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VPWR B1 a_287_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_179_49# B1 a_273_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VGND a_96_49# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_96_49# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VPWR a_96_49# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_2.cdl b/cells/o221a/sky130_fd_sc_lp__o221a_2.cdl
index a0ee1f7..ad9019f 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_2.cdl
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 pndB B2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 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_lp__o221a_2
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_2.netlist.tsv b/cells/o221a/sky130_fd_sc_lp__o221a_2.netlist.tsv
index 4fffb4a..9f23268 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_2.netlist.tsv
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_2.spice b/cells/o221a/sky130_fd_sc_lp__o221a_2.spice
index 569b118..13d204e 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_2.spice
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__o221a_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 X a_36_67# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=6.804e+11p ps=6.66e+06u
-M1001 a_119_67# C1 a_36_67# VNB nshort w=840000u l=150000u
-+  ad=4.578e+11p pd=4.45e+06u as=2.226e+11p ps=2.21e+06u
-M1002 a_205_67# B1 a_119_67# VNB nshort w=840000u l=150000u
-+  ad=6.006e+11p pd=4.79e+06u as=0p ps=0u
-M1003 a_205_67# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR C1 a_36_67# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.6065e+12p pd=1.011e+07u as=1.1151e+12p ps=6.81e+06u
-M1005 a_119_67# B2 a_205_67# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_36_67# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_36_67# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1008 a_36_67# B2 a_235_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=2.646e+11p ps=2.94e+06u
-M1009 a_461_367# A2 a_36_67# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1010 VPWR A1 a_461_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A1 a_205_67# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_235_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_36_67# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_36_67# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_36_67# C1 a_119_67# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_235_367# B2 a_36_67# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_36_67# A2 a_461_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_461_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_119_67# B1 a_205_67# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_36_67# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_205_67# B2 a_119_67# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND A2 a_205_67# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VPWR a_36_67# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR B1 a_235_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 X a_36_67# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_205_67# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VGND a_36_67# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_4.cdl b/cells/o221a/sky130_fd_sc_lp__o221a_4.cdl
index babe51d..9925cab 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_4.cdl
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 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
-MMPB1 sndB1 B2 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 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 phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 VNB nfet_01v8 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 phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 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=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
-MMNA1 pndA A2 VNB nshort 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
-MMNB0 pndB B1 VNB nshort 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
-MMNB1 pndB B2 VNB nshort 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
-MMNC0 y C1 VNB nshort 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
-MMINX X y VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=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_lp__o221a_4
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_4.netlist.tsv b/cells/o221a/sky130_fd_sc_lp__o221a_4.netlist.tsv
index 21333d8..bf79406 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_4.netlist.tsv
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_4.spice b/cells/o221a/sky130_fd_sc_lp__o221a_4.spice
index 26a08ff..5237605 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_4.spice
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_lp__o221a_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 a_292_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=2.8791e+12p ps=1.969e+07u
-M1001 X a_112_65# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1002 a_284_65# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=9.744e+11p pd=9.04e+06u as=1.2012e+12p ps=1.126e+07u
-M1003 a_284_65# B2 a_29_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=9.156e+11p ps=8.9e+06u
-M1004 VGND a_112_65# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1005 a_112_65# C1 a_29_65# VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1006 VPWR C1 a_112_65# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.0584e+12p ps=9.24e+06u
-M1007 VPWR A1 a_726_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1008 VGND A1 a_284_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_292_367# B2 a_112_65# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A2 a_284_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_726_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_112_65# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_112_65# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_29_65# C1 a_112_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_29_65# B1 a_284_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_726_367# A2 a_112_65# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_284_65# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_112_65# B2 a_292_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_112_65# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_29_65# B2 a_284_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_112_65# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_112_65# C1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_284_65# B1 a_29_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_112_65# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 X a_112_65# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR B1 a_292_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_112_65# A2 a_726_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_112_65# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VPWR a_112_65# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_726_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_29_65# C1 a_112_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_292_367# B2 a_112_65# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VPWR B1 a_292_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_284_65# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_112_65# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND A2 a_284_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 X a_112_65# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR C1 a_112_65# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_284_65# B2 a_29_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_112_65# B2 a_292_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_29_65# B2 a_284_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_284_65# B1 a_29_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VGND A1 a_284_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 VPWR a_112_65# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 X a_112_65# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 a_284_65# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 VGND a_112_65# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 VPWR A1 a_726_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 a_292_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 a_112_65# C1 a_29_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_29_65# B1 a_284_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 a_112_65# A2 a_726_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 X a_112_65# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 a_726_367# A2 a_112_65# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 VGND a_112_65# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_lp.cdl b/cells/o221a/sky130_fd_sc_lp__o221a_lp.cdl
index 6d5780a..467a173 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_lp.cdl
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_lp.cdl
@@ -16,30 +16,30 @@
 
 .SUBCKT sky130_fd_sc_lp__o221a_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMPB1 sndB1 B2 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
+MMPC0 VPWR C1 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
+MMIPX X y 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=1 w=0.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net74 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net74 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o221a_lp
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_lp.netlist.tsv b/cells/o221a/sky130_fd_sc_lp__o221a_lp.netlist.tsv
index 850101e..7c5de93 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_lp.netlist.tsv
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_lp.netlist.tsv
@@ -1,15 +1,15 @@
 sky130_fd_sc_lp__o221a_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	net74	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net74	y	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	net74	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net74	y	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/o221a/sky130_fd_sc_lp__o221a_lp.spice b/cells/o221a/sky130_fd_sc_lp__o221a_lp.spice
index 9465691..9c88ab2 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_lp.spice
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_lp.spice
@@ -16,30 +16,17 @@
 
 
 .subckt sky130_fd_sc_lp__o221a_lp A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 VPWR a_84_21# X VPB phighvt w=1e+06u l=250000u
-+  ad=6.65e+11p pd=5.33e+06u as=2.85e+11p ps=2.57e+06u
-M1001 a_84_21# A2 a_270_419# VPB phighvt w=1e+06u l=250000u
-+  ad=6.05e+11p pd=5.21e+06u as=2.4e+11p ps=2.48e+06u
-M1002 a_114_47# a_84_21# X VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1003 a_272_47# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.85425e+11p pd=3.15e+06u as=2.973e+11p ps=3.16e+06u
-M1004 VPWR B1 a_482_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1005 a_270_419# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A2 a_272_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_272_47# B2 a_490_141# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1008 a_482_419# B2 a_84_21# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_84_21# a_114_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_84_21# C1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_490_141# B1 a_272_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_84_21# C1 a_490_141# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 a_482_419# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_114_47# a_84_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 X a_84_21# a_114_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND A1 a_272_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_272_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_270_419# A2 a_84_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 VPWR C1 a_84_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 VPWR A1 a_270_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_272_47# B1 a_490_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_490_141# B2 a_272_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 X a_84_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 a_490_141# C1 a_84_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_84_21# B2 a_482_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_m.cdl b/cells/o221a/sky130_fd_sc_lp__o221a_m.cdl
index 5727675..8b0a671 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_m.cdl
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_m.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__o221a_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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.42 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=0.42 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.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.42 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.42 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o221a_m
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_m.netlist.tsv b/cells/o221a/sky130_fd_sc_lp__o221a_m.netlist.tsv
index 88c3cf4..f8a6194 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_m.netlist.tsv
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_m.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__o221a_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o221a/sky130_fd_sc_lp__o221a_m.spice b/cells/o221a/sky130_fd_sc_lp__o221a_m.spice
index 8e9be5c..a1db8f4 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_m.spice
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_m.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o221a_m A1 A2 B1 B2 C1 VGND VNB VPB VPWR X
-M1000 VGND A1 a_196_179# VNB nshort w=420000u l=150000u
-+  ad=2.373e+11p pd=2.81e+06u as=3.225e+11p ps=3.24e+06u
-M1001 a_110_179# C1 a_27_179# VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=1.113e+11p ps=1.37e+06u
-M1002 X a_27_179# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=3.192e+11p ps=3.2e+06u
-M1003 a_238_535# B1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 VPWR A1 a_396_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1005 a_110_179# B2 a_196_179# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_27_179# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1007 a_196_179# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_396_535# A2 a_27_179# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.289e+11p ps=2.77e+06u
-M1009 a_196_179# B1 a_110_179# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR C1 a_27_179# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_179# B2 a_238_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_27_179# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_110_179# B1 a_196_179# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_396_535# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VGND A2 a_196_179# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_27_179# A2 a_396_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_238_535# B2 a_27_179# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_27_179# C1 a_110_179# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_196_179# B2 a_110_179# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_27_179# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_196_179# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VPWR B1 a_238_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 VGND a_27_179# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_0.cdl b/cells/o221ai/sky130_fd_sc_lp__o221ai_0.cdl
index a0236a2..c1ca42a 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_0.cdl
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o221ai_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMPB1 sndB1 B2 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
+MMPC0 VPWR C1 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
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=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_lp__o221ai_0
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_0.netlist.tsv b/cells/o221ai/sky130_fd_sc_lp__o221ai_0.netlist.tsv
index d1bc24c..556ada2 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_0.netlist.tsv
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o221ai_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	1	0.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_0.spice b/cells/o221ai/sky130_fd_sc_lp__o221ai_0.spice
index 1d54687..b3bcdec 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_0.spice
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o221ai_0 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 VPWR A1 a_394_468# VPB phighvt w=640000u l=150000u
-+  ad=3.872e+11p pd=3.77e+06u as=1.344e+11p ps=1.7e+06u
-M1001 VPWR C1 Y VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=4.192e+11p ps=3.87e+06u
-M1002 a_110_47# C1 Y VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=1.113e+11p ps=1.37e+06u
-M1003 a_214_468# B1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1004 a_196_47# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=3.906e+11p ps=2.6e+06u
-M1005 Y B2 a_214_468# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_196_47# B1 a_110_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_110_47# B2 a_196_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_394_468# A2 Y VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A2 a_196_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y C1 a_110_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 Y A2 a_394_468# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_394_468# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 VPWR B1 a_214_468# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_214_468# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 a_110_47# B1 a_196_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND A1 a_196_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_196_47# B2 a_110_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_196_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_1.cdl b/cells/o221ai/sky130_fd_sc_lp__o221ai_1.cdl
index 5e713a9..3737717 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_1.cdl
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.26 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.84 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.84 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o221ai_1
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_1.netlist.tsv b/cells/o221ai/sky130_fd_sc_lp__o221ai_1.netlist.tsv
index 19cdfaf..422cee6 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_1.netlist.tsv
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_1.spice b/cells/o221ai/sky130_fd_sc_lp__o221ai_1.spice
index cd3e47c..f40c4d2 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_1.spice
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o221ai_1 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 VPWR C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.1151e+12p pd=6.81e+06u as=1.0521e+12p ps=6.71e+06u
-M1001 a_221_49# B2 a_114_47# VNB nshort w=840000u l=150000u
-+  ad=6.804e+11p pd=6.66e+06u as=5.502e+11p ps=4.67e+06u
-M1002 a_114_47# C1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1003 a_221_49# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.688e+11p ps=2.32e+06u
-M1004 a_520_367# A2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1005 VPWR A1 a_520_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A2 a_221_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_304_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1008 a_114_47# B1 a_221_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B2 a_304_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y C1 a_114_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VPWR B1 a_304_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_304_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_221_49# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND A1 a_221_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_221_49# B1 a_114_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 Y A2 a_520_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_520_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_114_47# B2 a_221_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_2.cdl b/cells/o221ai/sky130_fd_sc_lp__o221ai_2.cdl
index a42c9cf..ce50461 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_2.cdl
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 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
-MMPB1 sndB1 B2 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 VNB nfet_01v8 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 phighvt m=2 w=1.26 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.84 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.84 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 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_lp__o221ai_2
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_2.netlist.tsv b/cells/o221ai/sky130_fd_sc_lp__o221ai_2.netlist.tsv
index 8602ce5..ff4b226 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_2.netlist.tsv
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_2.spice b/cells/o221ai/sky130_fd_sc_lp__o221ai_2.spice
index 00a0274..0431191 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_2.spice
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__o221ai_2 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 VPWR A1 a_794_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.331e+12p pd=1.378e+07u as=8.064e+11p ps=6.32e+06u
-M1001 VPWR B1 a_388_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.938e+11p ps=6.3e+06u
-M1002 Y C1 a_29_69# VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=1.1172e+12p ps=9.38e+06u
-M1003 a_305_65# B1 a_29_69# VNB nshort w=840000u l=150000u
-+  ad=1.1508e+12p pd=1.114e+07u as=0p ps=0u
-M1004 VPWR C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.0584e+12p ps=9.24e+06u
-M1005 a_29_69# C1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_305_65# B2 a_29_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_388_367# B2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_794_367# A2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_305_65# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=5.376e+11p ps=4.64e+06u
-M1010 a_29_69# B1 a_305_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A1 a_305_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_305_65# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_388_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_29_69# B2 a_305_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y C1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_794_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A2 a_305_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y A2 a_794_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y B2 a_388_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B1 a_388_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_305_65# B2 a_29_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VGND A2 a_305_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 Y A2 a_794_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_305_65# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_29_69# C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_388_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_305_65# B1 a_29_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_29_69# B1 a_305_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VGND A1 a_305_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_305_65# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 VPWR A1 a_794_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 Y B2 a_388_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 Y C1 a_29_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_388_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_794_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 a_794_367# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_29_69# B2 a_305_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_4.cdl b/cells/o221ai/sky130_fd_sc_lp__o221ai_4.cdl
index 75c3c7c..a173620 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_4.cdl
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=4 w=0.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 VNB nfet_01v8 m=4 w=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 phighvt m=4 w=1.26 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.84 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.84 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=4 w=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_lp__o221ai_4
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_4.netlist.tsv b/cells/o221ai/sky130_fd_sc_lp__o221ai_4.netlist.tsv
index 4eb932d..2cf0a44 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_4.netlist.tsv
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_4.spice b/cells/o221ai/sky130_fd_sc_lp__o221ai_4.spice
index 601c82a..5730176 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_4.spice
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__o221ai_4 A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 Y A2 a_1317_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.1168e+12p pd=1.848e+07u as=1.4553e+12p ps=1.239e+07u
-M1001 VPWR C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.6649e+12p pd=2.187e+07u as=0p ps=0u
-M1002 a_509_47# B1 a_29_65# VNB nshort w=840000u l=150000u
-+  ad=2.247e+12p pd=2.047e+07u as=1.6884e+12p ps=1.578e+07u
-M1003 a_509_47# B1 a_29_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y C1 a_29_65# VNB nshort w=840000u l=150000u
-+  ad=5.376e+11p pd=4.64e+06u as=0p ps=0u
-M1006 a_592_367# B2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=0p ps=0u
-M1007 VGND A1 a_509_47# VNB nshort w=840000u l=150000u
-+  ad=9.408e+11p pd=8.96e+06u as=0p ps=0u
-M1008 Y A2 a_1317_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A2 a_509_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y C1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR B1 a_592_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_29_65# B2 a_509_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_509_47# B2 a_29_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B2 a_592_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_29_65# B1 a_509_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1317_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1317_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_29_65# C1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_29_65# B1 a_509_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y B2 a_592_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y C1 a_29_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_509_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR B1 a_592_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y C1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A2 a_509_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_592_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A1 a_509_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1317_367# A2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR A1 a_1317_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_509_47# B2 a_29_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_29_65# B2 a_509_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_29_65# C1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR A1 a_1317_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1317_367# A2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_509_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_592_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_592_367# B2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_509_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_509_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_1317_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_509_47# B1 a_29_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_29_65# B2 a_509_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_592_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_1317_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_509_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR B1 a_592_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_592_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_29_65# C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VGND A2 a_509_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 Y A2 a_1317_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_1317_367# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_509_47# B2 a_29_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_1317_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 Y B2 a_592_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_592_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_509_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_1317_367# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VGND A2 a_509_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 a_509_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 VGND A1 a_509_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 a_29_65# C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 VPWR A1 a_1317_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 Y C1 a_29_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 a_509_47# B1 a_29_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X28 a_509_47# B2 a_29_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 a_29_65# B1 a_509_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X30 Y C1 a_29_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X31 Y A2 a_1317_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X32 a_29_65# B2 a_509_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X33 VGND A1 a_509_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X34 Y B2 a_592_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X35 a_509_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X36 a_592_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X37 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X38 VPWR B1 a_592_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X39 a_29_65# B1 a_509_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.cdl b/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.cdl
index fcd9acc..023ac4c 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.cdl
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o221ai_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMPB1 sndB1 B2 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
+MMPC0 VPWR C1 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
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=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_lp__o221ai_lp
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.netlist.tsv b/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.netlist.tsv
index 3d0bf9e..5281228 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.netlist.tsv
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o221ai_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.spice b/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.spice
index 0ae3fe7..e4c9ceb 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.spice
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o221ai_lp A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 VGND A2 a_302_55# VNB nshort w=420000u l=150000u
-+  ad=4.431e+11p pd=2.95e+06u as=2.688e+11p ps=2.96e+06u
-M1001 Y B2 a_347_419# VPB phighvt w=1e+06u l=250000u
-+  ad=6.05e+11p pd=5.21e+06u as=2.4e+11p ps=2.48e+06u
-M1002 a_216_55# B2 a_302_55# VNB nshort w=420000u l=150000u
-+  ad=2.709e+11p pd=2.97e+06u as=0p ps=0u
-M1003 VPWR C1 Y VPB phighvt w=1e+06u l=250000u
-+  ad=6.7e+11p pd=5.34e+06u as=0p ps=0u
-M1004 a_216_55# C1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1005 a_559_419# A2 Y VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1006 a_302_55# B1 a_216_55# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_347_419# B1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A1 a_559_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_302_55# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A2 a_559_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 VGND A1 a_302_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y C1 a_216_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_559_419# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_216_55# B1 a_302_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_302_55# B2 a_216_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR B1 a_347_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_302_55# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_347_419# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_m.cdl b/cells/o221ai/sky130_fd_sc_lp__o221ai_m.cdl
index b76788f..71fdb2a 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_m.cdl
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o221ai_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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.42 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=0.42 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.42 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.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 pndB B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=0.42 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.42 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=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_lp__o221ai_m
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_m.netlist.tsv b/cells/o221ai/sky130_fd_sc_lp__o221ai_m.netlist.tsv
index be7309d..9ad523d 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_m.netlist.tsv
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o221ai_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	pndB	B2	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	pndB	B2	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_m.spice b/cells/o221ai/sky130_fd_sc_lp__o221ai_m.spice
index 4a10e42..c26e1ac 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_m.spice
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o221ai_m A1 A2 B1 B2 C1 VGND VNB VPB VPWR Y
-M1000 a_148_47# C1 Y VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=1.113e+11p ps=1.37e+06u
-M1001 VPWR A1 a_441_463# VPB phighvt w=420000u l=150000u
-+  ad=2.943e+11p pd=3.13e+06u as=8.82e+10p ps=1.26e+06u
-M1002 Y B2 a_245_480# VPB phighvt w=420000u l=150000u
-+  ad=3.2995e+11p pd=3.32e+06u as=8.82e+10p ps=1.26e+06u
-M1003 a_234_47# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.415e+11p pd=2.83e+06u as=1.764e+11p ps=1.68e+06u
-M1004 a_148_47# B2 a_234_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_234_47# B1 a_148_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR C1 Y VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_441_463# A2 Y VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_234_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_245_480# B1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y C1 a_148_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_234_47# B2 a_148_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_148_47# B1 a_234_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_441_463# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VPWR B1 a_245_480# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VGND A1 a_234_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 Y A2 a_441_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_234_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_245_480# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_0.cdl b/cells/o22a/sky130_fd_sc_lp__o22a_0.cdl
index a9978a2..55969e1 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_0.cdl
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o22a_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMPB1 sndB1 B2 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
+MMIPX X y 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 y B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o22a_0
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_0.netlist.tsv b/cells/o22a/sky130_fd_sc_lp__o22a_0.netlist.tsv
index 1c5614f..5c32824 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_0.netlist.tsv
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o22a_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o22a/sky130_fd_sc_lp__o22a_0.spice b/cells/o22a/sky130_fd_sc_lp__o22a_0.spice
index 7c34ea8..2f08d45 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_0.spice
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o22a_0 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 VGND a_80_313# X VNB nshort w=420000u l=150000u
-+  ad=4.179e+11p pd=3.67e+06u as=1.113e+11p ps=1.37e+06u
-M1001 a_80_313# B2 a_372_489# VPB phighvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=1.536e+11p ps=1.76e+06u
-M1002 a_286_125# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.688e+11p pd=2.96e+06u as=0p ps=0u
-M1003 a_80_313# B1 a_286_125# VNB nshort w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=0p ps=0u
-M1004 a_286_125# B2 a_80_313# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A1 a_536_489# VPB phighvt w=640000u l=150000u
-+  ad=9.12e+11p pd=5.41e+06u as=2.432e+11p ps=2.04e+06u
-M1006 VPWR a_80_313# X VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1007 a_372_489# B1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_286_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_536_489# A2 a_80_313# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_80_313# B2 a_286_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR B1 a_372_489# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 VGND A1 a_286_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_536_489# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 a_286_125# B1 a_80_313# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_80_313# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 a_80_313# A2 a_536_489# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 a_372_489# B2 a_80_313# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 X a_80_313# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_286_125# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_1.cdl b/cells/o22a/sky130_fd_sc_lp__o22a_1.cdl
index 9436d35..38aac19 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_1.cdl
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 y B2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 y B2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o22a_1
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_1.netlist.tsv b/cells/o22a/sky130_fd_sc_lp__o22a_1.netlist.tsv
index 6e88287..1737e13 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_1.netlist.tsv
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_1.spice b/cells/o22a/sky130_fd_sc_lp__o22a_1.spice
index be14238..a888fef 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_1.spice
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o22a_1 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 a_80_21# B1 a_265_47# VNB nshort w=840000u l=150000u
-+  ad=2.52e+11p pd=2.28e+06u as=7.686e+11p ps=6.87e+06u
-M1001 a_265_47# B2 a_80_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_265_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=5.754e+11p ps=4.73e+06u
-M1003 VPWR A1 a_545_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0647e+12p pd=6.73e+06u as=5.292e+11p ps=3.36e+06u
-M1004 VGND a_80_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1005 a_545_367# A2 a_80_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=5.607e+11p ps=3.41e+06u
-M1006 VPWR a_80_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1007 VGND A2 a_265_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_348_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.024e+11p pd=3e+06u as=0p ps=0u
-M1009 a_80_21# B2 a_348_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_348_367# B2 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND A1 a_265_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_80_21# A2 a_545_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_80_21# B2 a_265_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_545_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_265_47# B1 a_80_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_265_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VPWR B1 a_348_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_2.cdl b/cells/o22a/sky130_fd_sc_lp__o22a_2.cdl
index 8a2a519..800b5e9 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_2.cdl
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 y B2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 y B2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 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_lp__o22a_2
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_2.netlist.tsv b/cells/o22a/sky130_fd_sc_lp__o22a_2.netlist.tsv
index ba0ea90..5861bbc 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_2.netlist.tsv
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_2.spice b/cells/o22a/sky130_fd_sc_lp__o22a_2.spice
index 39ac0bc..551f6c5 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_2.spice
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o22a_2 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 X a_80_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=1.575e+12p ps=1.006e+07u
-M1001 VGND A2 a_303_49# VNB nshort w=840000u l=150000u
-+  ad=7.644e+11p pd=6.86e+06u as=7.182e+11p ps=6.75e+06u
-M1002 a_303_49# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_80_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_566_367# A2 a_80_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=5.103e+11p pd=3.33e+06u as=4.914e+11p ps=3.3e+06u
-M1005 X a_80_23# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1006 VPWR A1 a_566_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_80_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_80_23# B1 a_303_49# VNB nshort w=840000u l=150000u
-+  ad=2.52e+11p pd=2.28e+06u as=0p ps=0u
-M1009 a_303_49# B2 a_80_23# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_386_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1011 a_80_23# B2 a_386_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_80_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_80_23# B2 a_303_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VGND A1 a_303_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_303_49# B1 a_80_23# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR a_80_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_303_49# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 X a_80_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 X a_80_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_80_23# A2 a_566_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_566_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR B1 a_386_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_386_367# B2 a_80_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_4.cdl b/cells/o22a/sky130_fd_sc_lp__o22a_4.cdl
index ff92b58..b17b6f4 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_4.cdl
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 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
-MMPB1 sndB1 B2 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 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 phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 y B2 VNB nfet_01v8 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=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
-MMNA1 pndA A2 VNB nshort 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
-MMNB0 y B1 VNB nshort 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
-MMNB1 y B2 VNB nshort 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
-MMINX X y VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=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_lp__o22a_4
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_4.netlist.tsv b/cells/o22a/sky130_fd_sc_lp__o22a_4.netlist.tsv
index 94cfcc8..1a2375b 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_4.netlist.tsv
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_4.spice b/cells/o22a/sky130_fd_sc_lp__o22a_4.spice
index 3310a35..a9a652c 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_4.spice
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_lp__o22a_4 A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 VGND A1 a_525_47# VNB nshort w=840000u l=150000u
-+  ad=1.2096e+12p pd=1.128e+07u as=1.218e+12p ps=1.13e+07u
-M1001 a_86_23# A2 a_982_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=7.056e+11p ps=6.16e+06u
-M1002 VPWR a_86_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.0097e+12p pd=1.579e+07u as=7.056e+11p ps=6.16e+06u
-M1003 a_608_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1004 VGND A2 a_525_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_86_23# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1006 a_86_23# B2 a_525_47# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1007 VPWR A1 a_982_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_608_367# B2 a_86_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_86_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_86_23# B1 a_525_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_86_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_525_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_982_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_86_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_86_23# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_86_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_982_367# A2 a_86_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_86_23# B2 a_608_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_525_47# B1 a_86_23# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_525_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_525_47# B2 a_86_23# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_86_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR B1 a_608_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_86_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR B1 a_608_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_86_23# A2 a_982_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR A1 a_982_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND a_86_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 X a_86_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_86_23# B1 a_525_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_525_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_608_367# B2 a_86_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_982_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VGND a_86_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VGND A2 a_525_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_525_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_608_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VGND A1 a_525_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_86_23# B2 a_608_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 VPWR a_86_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 X a_86_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VPWR a_86_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_982_367# A2 a_86_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 a_525_47# B1 a_86_23# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 X a_86_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 a_86_23# B2 a_525_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_525_47# B2 a_86_23# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_lp.cdl b/cells/o22a/sky130_fd_sc_lp__o22a_lp.cdl
index 455364e..dabba90 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_lp.cdl
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_lp.cdl
@@ -16,26 +16,26 @@
 
 .SUBCKT sky130_fd_sc_lp__o22a_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMPB1 sndB1 B2 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
+MMIPX X y 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 y B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=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 net66 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net66 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o22a_lp
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_lp.netlist.tsv b/cells/o22a/sky130_fd_sc_lp__o22a_lp.netlist.tsv
index 4bccb68..e64bef3 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_lp.netlist.tsv
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_lp.netlist.tsv
@@ -1,13 +1,13 @@
 sky130_fd_sc_lp__o22a_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	net66	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net66	y	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	net66	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net66	y	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/o22a/sky130_fd_sc_lp__o22a_lp.spice b/cells/o22a/sky130_fd_sc_lp__o22a_lp.spice
index 8c09fa7..59fc756 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_lp.spice
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_lp.spice
@@ -16,26 +16,15 @@
 
 
 .subckt sky130_fd_sc_lp__o22a_lp A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 X a_232_419# a_612_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1001 a_232_419# A2 a_134_419# VPB phighvt w=1e+06u l=250000u
-+  ad=2.8e+11p pd=2.56e+06u as=2.4e+11p ps=2.48e+06u
-M1002 X a_232_419# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=1.105e+12p ps=6.21e+06u
-M1003 a_30_173# B1 a_232_419# VNB nshort w=420000u l=150000u
-+  ad=3.549e+11p pd=4.22e+06u as=2.5005e+11p ps=2.17e+06u
-M1004 a_30_173# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.793e+11p ps=3.02e+06u
-M1005 a_232_419# B2 a_30_173# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_338_419# B2 a_232_419# VPB phighvt w=1e+06u l=250000u
-+  ad=3e+11p pd=2.6e+06u as=0p ps=0u
-M1007 VGND A1 a_30_173# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_134_419# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B1 a_338_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_612_47# a_232_419# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1 a_134_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_134_419# A2 a_232_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_30_173# B2 a_232_419# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_30_173# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_232_419# a_612_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_232_419# B1 a_30_173# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_232_419# B2 a_338_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_338_419# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 VPWR a_232_419# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 VGND A2 a_30_173# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_612_47# a_232_419# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_m.cdl b/cells/o22a/sky130_fd_sc_lp__o22a_m.cdl
index ff27b9e..2e736cf 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_m.cdl
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o22a_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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.42 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=0.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 y B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o22a_m
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_m.netlist.tsv b/cells/o22a/sky130_fd_sc_lp__o22a_m.netlist.tsv
index eac560f..bff1a20 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_m.netlist.tsv
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o22a_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o22a/sky130_fd_sc_lp__o22a_m.spice b/cells/o22a/sky130_fd_sc_lp__o22a_m.spice
index 15e2c57..2434d78 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_m.spice
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o22a_m A1 A2 B1 B2 VGND VNB VPB VPWR X
-M1000 VPWR a_88_187# X VPB phighvt w=420000u l=150000u
-+  ad=5.124e+11p pd=4.12e+06u as=1.197e+11p ps=1.41e+06u
-M1001 a_88_187# B2 a_339_535# VPB phighvt w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=8.82e+10p ps=1.26e+06u
-M1002 VGND a_88_187# X VNB nshort w=420000u l=150000u
-+  ad=3.213e+11p pd=3.21e+06u as=1.197e+11p ps=1.41e+06u
-M1003 VGND A2 a_237_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.024e+11p ps=3.12e+06u
-M1004 a_339_535# B1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR A1 a_519_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1006 a_519_535# A2 a_88_187# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_237_81# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_88_187# B1 a_237_81# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1009 a_237_81# B2 a_88_187# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_237_81# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_88_187# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_88_187# A2 a_519_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VGND A1 a_237_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_237_81# B1 a_88_187# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_88_187# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_519_535# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_339_535# B2 a_88_187# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VPWR B1 a_339_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_88_187# B2 a_237_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_0.cdl b/cells/o22ai/sky130_fd_sc_lp__o22ai_0.cdl
index 7efd9ac..745f66e 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_0.cdl
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_0.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__o22ai_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMPB1 sndB1 B2 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
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o22ai_0
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_0.netlist.tsv b/cells/o22ai/sky130_fd_sc_lp__o22ai_0.netlist.tsv
index d93333f..6b342ab 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_0.netlist.tsv
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_0.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__o22ai_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_0.spice b/cells/o22ai/sky130_fd_sc_lp__o22ai_0.spice
index 25f208f..151f791 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_0.spice
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_0.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__o22ai_0 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_307_483# A2 Y VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.792e+11p ps=1.84e+06u
-M1001 a_143_483# B1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=4.256e+11p ps=3.89e+06u
-M1002 Y B2 a_143_483# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR A1 a_307_483# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B1 a_27_85# VNB nshort w=420000u l=150000u
-+  ad=1.491e+11p pd=1.55e+06u as=3.612e+11p ps=4.24e+06u
-M1005 VGND A2 a_27_85# VNB nshort w=420000u l=150000u
-+  ad=1.323e+11p pd=1.47e+06u as=0p ps=0u
-M1006 a_27_85# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_27_85# B2 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_85# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_307_483# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 Y B2 a_27_85# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR B1 a_143_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 Y A2 a_307_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_143_483# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 a_27_85# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND A1 a_27_85# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_1.cdl b/cells/o22ai/sky130_fd_sc_lp__o22ai_1.cdl
index 5631c76..2022b11 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_1.cdl
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=1 w=1.26 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.84 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.84 l=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o22ai_1
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_1.netlist.tsv b/cells/o22ai/sky130_fd_sc_lp__o22ai_1.netlist.tsv
index b6a3b5e..ca1e099 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_1.netlist.tsv
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_1.spice b/cells/o22ai/sky130_fd_sc_lp__o22ai_1.spice
index ea96cb3..869d7fa 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_1.spice
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__o22ai_1 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 VPWR A1 a_341_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.678e+11p pd=6.1e+06u as=2.646e+11p ps=2.94e+06u
-M1001 VGND A2 a_27_69# VNB nshort w=840000u l=150000u
-+  ad=5.208e+11p pd=2.92e+06u as=7.35e+11p ps=6.79e+06u
-M1002 a_341_367# A2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=8.127e+11p ps=3.81e+06u
-M1003 Y B1 a_27_69# VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1004 Y B2 a_110_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=2.646e+11p ps=2.94e+06u
-M1005 a_27_69# B2 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_27_69# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_110_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_341_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_110_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_27_69# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 Y B2 a_27_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND A1 a_27_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPWR B1 a_110_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 Y A2 a_341_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_27_69# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_2.cdl b/cells/o22ai/sky130_fd_sc_lp__o22ai_2.cdl
index 6730648..a89e4b8 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_2.cdl
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 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
-MMPB1 sndB1 B2 VPB phighvt m=2 w=1.26 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.84 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.84 l=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 VNB nfet_01v8 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_lp__o22ai_2
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_2.netlist.tsv b/cells/o22ai/sky130_fd_sc_lp__o22ai_2.netlist.tsv
index 03c4202..d49b70a 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_2.netlist.tsv
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_2.spice b/cells/o22ai/sky130_fd_sc_lp__o22ai_2.spice
index 5b9676a..664bee7 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_2.spice
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__o22ai_2 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_43_367# B2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0206e+12p pd=9.18e+06u as=7.056e+11p ps=6.16e+06u
-M1001 a_491_367# A2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0206e+12p pd=9.18e+06u as=0p ps=0u
-M1002 Y B2 a_43_65# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=1.5288e+12p ps=1.204e+07u
-M1003 VGND A1 a_43_65# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1004 VGND A2 a_43_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_491_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1006 VPWR B1 a_43_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_43_65# B2 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_43_65# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B2 a_43_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y A2 a_491_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_43_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B1 a_43_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_43_65# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A1 a_491_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_43_65# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 a_43_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_43_65# B2 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 Y B2 a_43_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_43_65# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND A1 a_43_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_43_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_491_367# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_43_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR B1 a_43_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VGND A2 a_43_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_43_65# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_491_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 Y A2 a_491_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_43_65# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 Y B2 a_43_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VPWR A1 a_491_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_4.cdl b/cells/o22ai/sky130_fd_sc_lp__o22ai_4.cdl
index 698ab6d..dbd2970 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_4.cdl
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.84 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.26 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.84 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.84 l=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 VNB nfet_01v8 m=4 w=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_lp__o22ai_4
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_4.netlist.tsv b/cells/o22ai/sky130_fd_sc_lp__o22ai_4.netlist.tsv
index 9bb0f69..592b606 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_4.netlist.tsv
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_4.spice b/cells/o22ai/sky130_fd_sc_lp__o22ai_4.spice
index 187413b..55bcb5d 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_4.spice
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_lp__o22ai_4 A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_821_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=1.8144e+12p ps=1.548e+07u
-M1001 a_33_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=2.1546e+12p pd=2.025e+07u as=9.408e+11p ps=8.96e+06u
-M1002 a_119_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=0p ps=0u
-M1003 Y A2 a_119_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=0p ps=0u
-M1004 Y B2 a_821_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_119_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A1 a_33_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_33_47# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=9.408e+11p ps=8.96e+06u
-M1008 Y B2 a_33_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_821_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_119_367# A2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_33_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A1 a_119_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_821_367# B2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_33_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_33_47# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A1 a_33_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_33_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y B2 a_33_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_119_367# A2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR B1 a_821_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_821_367# B2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y A2 a_119_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A2 a_33_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y B1 a_33_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR A1 a_119_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND A2 a_33_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y B1 a_33_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y B2 a_821_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR B1 a_821_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_33_47# B2 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_33_47# B2 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_33_47# B2 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 Y B2 a_33_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 Y B2 a_821_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_33_47# B2 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_821_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_33_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_33_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VGND A2 a_33_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_119_367# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_33_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VPWR A1 a_119_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VGND A1 a_33_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_119_367# A2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 Y A2 a_119_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_119_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_33_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 VGND A2 a_33_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_33_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_821_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_821_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 VPWR B1 a_821_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 Y A2 a_119_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 Y B2 a_33_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_33_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 VPWR A1 a_119_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 a_821_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 VGND A1 a_33_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 Y B1 a_33_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X28 Y B1 a_33_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 Y B2 a_821_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 VPWR B1 a_821_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 a_119_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.cdl b/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.cdl
index 3129241..47e0c50 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.cdl
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__o22ai_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPB0 VPWR B1 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
+MMPB1 sndB1 B2 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
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o22ai_lp
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.netlist.tsv b/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.netlist.tsv
index bdb9387..5baea4b 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.netlist.tsv
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__o22ai_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.spice b/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.spice
index e5fd65a..419b61c 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.spice
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__o22ai_lp A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 Y B2 a_169_419# VPB phighvt w=1e+06u l=250000u
-+  ad=3.2e+11p pd=2.64e+06u as=2.4e+11p ps=2.48e+06u
-M1001 VPWR A1 a_381_419# VPB phighvt w=1e+06u l=250000u
-+  ad=5.7e+11p pd=5.14e+06u as=6.1e+11p ps=3.22e+06u
-M1002 a_70_101# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=4.242e+11p pd=4.54e+06u as=2.982e+11p ps=2.26e+06u
-M1003 VGND A2 a_70_101# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_70_101# B2 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1005 a_169_419# B1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_381_419# A2 Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B1 a_70_101# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_169_419# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 Y B2 a_70_101# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_70_101# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y A2 a_381_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_70_101# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND A1 a_70_101# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_381_419# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 VPWR B1 a_169_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_m.cdl b/cells/o22ai/sky130_fd_sc_lp__o22ai_m.cdl
index b9b7270..6abd23a 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_m.cdl
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_m.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__o22ai_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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.42 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=0.42 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.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=1 w=0.42 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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o22ai_m
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_m.netlist.tsv b/cells/o22ai/sky130_fd_sc_lp__o22ai_m.netlist.tsv
index e6e33b9..4bff88d 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_m.netlist.tsv
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_m.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__o22ai_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	Y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_m.spice b/cells/o22ai/sky130_fd_sc_lp__o22ai_m.spice
index f2c541f..8759be9 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_m.spice
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_m.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__o22ai_m A1 A2 B1 B2 VGND VNB VPB VPWR Y
-M1000 VGND A2 a_85_82# VNB nshort w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=4.074e+11p ps=4.46e+06u
-M1001 a_198_535# B1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.226e+11p ps=2.74e+06u
-M1002 Y B2 a_198_535# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1003 a_85_82# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Y B1 a_85_82# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1005 VPWR A1 a_356_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1006 a_85_82# B2 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_356_535# A2 Y VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B1 a_198_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VGND A1 a_85_82# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_85_82# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y B2 a_85_82# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_85_82# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 Y A2 a_356_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_198_535# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_356_535# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.cdl b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.cdl
index 85278bc..1bfa370 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.cdl
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__o2bb2a_0 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand0 VGND A1_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNaoi10 nmid B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi11 nmid B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 y inand VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=1 w=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inand VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB 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
-MMPnand0 inand A1_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMPnand0 inand A1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand A2_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR B1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.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.42 l=0.15 mult=1 sa=0.265
+MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inand VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMPaoi20 y inand VPB pfet_01v8_hvt m=1 w=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_lp__o2bb2a_0
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.netlist.tsv b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.netlist.tsv
index 96db017..55b3aeb 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.netlist.tsv
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__o2bb2a_0	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inand	nmid	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inand	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inand	nmid	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	y	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.spice b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.spice
index db62a98..ed1d0aa 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.spice
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o2bb2a_0 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 a_512_47# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=2.352e+11p ps=2.8e+06u
-M1001 a_512_47# a_229_483# a_80_176# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1002 VGND a_80_176# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1003 a_224_70# A1_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1004 a_229_483# A2_N a_224_70# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1005 VPWR a_80_176# X VPB phighvt w=640000u l=150000u
-+  ad=6.463e+11p pd=5.76e+06u as=1.696e+11p ps=1.81e+06u
-M1006 VPWR B1 a_598_483# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1007 a_229_483# A1_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.785e+11p pd=1.69e+06u as=0p ps=0u
-M1008 a_598_483# B2 a_80_176# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1009 VPWR A2_N a_229_483# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B2 a_512_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_80_176# a_229_483# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A1_N a_229_483# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_229_483# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 X a_80_176# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_224_70# A2_N a_229_483# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_80_176# B2 a_598_483# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VPWR a_229_483# a_80_176# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_80_176# a_229_483# a_512_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 X a_80_176# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 VGND A1_N a_224_70# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_598_483# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_512_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND B1 a_512_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.cdl b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.cdl
index e2ca796..ee887c3 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.cdl
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand0 VGND A1_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNaoi10 nmid B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi11 nmid B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 y inand VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inand VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265
+MMPnand0 inand A1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand A2_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR B1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.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.42 l=0.15 mult=1 sa=0.265
+MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inand VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMPaoi20 y inand VPB pfet_01v8_hvt m=1 w=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_lp__o2bb2a_1
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.netlist.tsv b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.netlist.tsv
index 7c3c6c5..cd9ede9 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.netlist.tsv
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inand	nmid	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inand	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inand	nmid	VNB	nfet_01v8	1	0.42	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.26	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	y	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.spice b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.spice
index 8d60639..49bcd8d 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.spice
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o2bb2a_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 a_506_47# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=4.326e+11p ps=4.05e+06u
-M1001 a_80_21# a_286_492# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=8.589e+11p ps=7.23e+06u
-M1002 VPWR B1 a_592_492# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1003 a_506_47# a_286_492# a_80_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 VPWR A2_N a_286_492# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1005 VGND a_80_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1006 VGND B2 a_506_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_286_492# A2_N a_237_131# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.008e+11p ps=1.32e+06u
-M1008 a_592_492# B2 a_80_21# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_286_492# A1_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_237_131# A1_N VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_80_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 a_286_492# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_80_21# B2 a_592_492# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_237_131# A2_N a_286_492# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND A1_N a_237_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_80_21# a_286_492# a_506_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_592_492# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_506_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR A1_N a_286_492# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 VPWR a_286_492# a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 VGND B1 a_506_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.cdl b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.cdl
index 879a89c..8e8fdcc 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.cdl
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 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
-MMNnand0 VGND A1_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNaoi10 nmid B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi11 nmid B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 y inand VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=2 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inand VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=2 w=1.26 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.64 l=0.15 mult=1 sa=0.265
+MMPnand0 inand A1_N 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
+MMPnand1 inand A2_N 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
+MMPaoi10 VPWR B1 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
-MMPnand1 inand A2_N VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMPaoi11 sndPB1 B2 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
-MMPaoi10 VPWR B1 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
-MMPaoi11 sndPB1 B2 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
-MMPaoi20 y inand VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMPaoi20 y inand 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_lp__o2bb2a_2
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.netlist.tsv b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.netlist.tsv
index cac7d20..b2cb030 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.netlist.tsv
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inand	nmid	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inand	VPWR	VPB	phighvt	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.84	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inand	nmid	VNB	nfet_01v8	1	0.42	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.26	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.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	y	VPB	pfet_01v8_hvt	1	0.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.spice b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.spice
index d0ebd53..876e322 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.spice
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__o2bb2a_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 a_300_21# A2_N VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=1.6214e+12p ps=1.164e+07u
-M1001 a_150_367# B1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1002 X a_222_367# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=6.51e+11p ps=6.24e+06u
-M1003 a_67_47# B2 VGND VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=0p ps=0u
-M1004 VGND B1 a_67_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_222_367# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1006 VGND a_222_367# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR a_300_21# a_222_367# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.496e+11p ps=2.06e+06u
-M1008 VPWR A1_N a_300_21# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_222_367# a_300_21# a_67_47# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1010 a_222_367# B2 a_150_367# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_585_47# A2_N a_300_21# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1012 VGND A1_N a_585_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_222_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_300_21# A2_N a_585_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND B2 a_67_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_67_47# a_300_21# a_222_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 X a_222_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR A2_N a_300_21# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_150_367# B2 a_222_367# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 a_67_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_300_21# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 a_585_47# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_222_367# a_300_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X10 VGND a_222_367# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VPWR B1 a_150_367# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 X a_222_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VPWR a_222_367# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.cdl b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.cdl
index 49baf54..95ce096 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.cdl
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=4 w=0.84 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=2 w=0.84 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8 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
-MMNnand1 sndNA1N A2_N VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8 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
-MMNaoi10 nmid B1 VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNaoi10 nmid B1 VNB nfet_01v8 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
+MMNaoi11 nmid B2 VNB nfet_01v8 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
+MMNaoi20 y inand VNB nfet_01v8 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 y VPB pfet_01v8_hvt m=4 w=1.26 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.84 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.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 phighvt m=4 w=1.26 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=1.26 l=0.15 mult=1 sa=0.265
+MMPnand0 inand A1_N VPB pfet_01v8_hvt m=2 w=1.26 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=1.26 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.26 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=1.26 l=0.15 mult=1 sa=0.265
+MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
+MMPaoi20 y inand VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o2bb2a_4
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.netlist.tsv b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.netlist.tsv
index d63144d..262818a 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.netlist.tsv
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inand	nmid	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inand	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	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.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inand	nmid	VNB	nfet_01v8	2	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	4	1.26	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	1.26	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	1.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.spice b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.spice
index 2dbea8f..9c6408b 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.spice
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_lp__o2bb2a_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 VPWR A1_N a_462_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.2823e+12p pd=2.285e+07u as=7.056e+11p ps=6.16e+06u
-M1001 a_218_367# a_462_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1002 VGND a_218_367# X VNB nshort w=840000u l=150000u
-+  ad=1.7388e+12p pd=1.422e+07u as=4.704e+11p ps=4.48e+06u
-M1003 a_49_47# a_462_21# a_218_367# VNB nshort w=840000u l=150000u
-+  ad=9.156e+11p pd=8.9e+06u as=2.352e+11p ps=2.24e+06u
-M1004 VGND A1_N a_768_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1005 VGND a_218_367# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_49_47# B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_768_47# A1_N VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_218_367# B2 a_132_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1009 VGND B1 a_49_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_218_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1011 VPWR B1 a_132_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A2_N a_462_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_218_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_49_47# B2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_218_367# a_462_21# a_49_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_462_21# A2_N a_768_47# VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1017 X a_218_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_218_367# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_462_21# a_218_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_462_21# A2_N VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_132_367# B2 a_218_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_462_21# A1_N VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR a_218_367# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND B2 a_49_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_768_47# A2_N a_462_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_132_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 X a_218_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_49_47# a_462_21# a_218_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND a_218_367# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_218_367# B2 a_132_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_49_47# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR a_462_21# a_218_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VPWR A1_N a_462_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_218_367# a_462_21# a_49_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_462_21# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR a_218_367# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_132_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 X a_218_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VPWR B1 a_132_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VGND a_218_367# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_218_367# a_462_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_462_21# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VPWR a_218_367# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 X a_218_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_768_47# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 X a_218_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 X a_218_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 VGND B2 a_49_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 VGND A1_N a_768_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 a_132_367# B2 a_218_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 VPWR A2_N a_462_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 a_768_47# A2_N a_462_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 a_49_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 a_462_21# A2_N a_768_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 VGND B1 a_49_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.cdl b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.cdl
index a104d1e..0961b00 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.cdl
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.cdl
@@ -16,30 +16,30 @@
 
 .SUBCKT sky130_fd_sc_lp__o2bb2a_lp 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand0 VGND A1_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inand VNB nshort m=1 w=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 net30 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB 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
-MMPnand0 inand A1_N VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265
+MMNaoi10 nmid B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265
+MMNaoi11 nmid B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNaoi20 y inand VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net30 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIP2 X y 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
-MMPaoi20 y inand 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
+MMPnand0 inand A1_N 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
+MMPnand1 inand A2_N 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
+MMPaoi10 VPWR B1 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
+MMPaoi11 sndPB1 B2 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
+MMPaoi20 y inand 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_lp__o2bb2a_lp
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.netlist.tsv b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.netlist.tsv
index 1fd2f04..b33b0dc 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.netlist.tsv
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.netlist.tsv
@@ -1,15 +1,15 @@
 sky130_fd_sc_lp__o2bb2a_lp	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	net30	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inand	nmid	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net30	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inand	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	net30	VNB	nfet_01v8	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inand	nmid	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net30	y	VGND	VNB	nfet_01v8	1	0.42	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	y	inand	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/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.spice b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.spice
index b75d063..7557ec5 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.spice
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.spice
@@ -16,30 +16,17 @@
 
 
 .subckt sky130_fd_sc_lp__o2bb2a_lp A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 a_86_22# a_298_416# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.8e+11p pd=2.56e+06u as=1.385e+12p ps=8.77e+06u
-M1001 VGND B2 a_604_142# VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=2.457e+11p ps=2.85e+06u
-M1002 VPWR B1 a_674_416# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1003 a_604_142# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR A2_N a_298_416# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=3.1e+11p ps=2.62e+06u
-M1005 VPWR a_86_22# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1006 VGND a_86_22# a_116_48# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1007 a_298_416# A1_N VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_674_416# B2 a_86_22# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_116_48# a_86_22# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1010 a_274_48# A1_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1011 a_298_416# A2_N a_274_48# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1012 a_604_142# a_298_416# a_86_22# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.449e+11p ps=1.53e+06u
+X0 a_674_416# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 VPWR A1_N a_298_416# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_604_142# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_86_22# B2 a_674_416# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_298_416# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 VPWR a_298_416# a_86_22# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 VGND B1 a_604_142# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_274_48# A2_N a_298_416# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_86_22# a_298_416# a_604_142# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 X a_86_22# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 a_116_48# a_86_22# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 X a_86_22# a_116_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND A1_N a_274_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.cdl b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.cdl
index c09f32d..fb9ba89 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.cdl
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__o2bb2a_m 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand0 VGND A1_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNaoi10 nmid B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi11 nmid B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 y inand VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 y inand VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MMPnand0 inand A1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand A2_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR B1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.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.42 l=0.15 mult=1 sa=0.265
+MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 y inand VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMPaoi20 y inand VPB pfet_01v8_hvt m=1 w=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_lp__o2bb2a_m
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.netlist.tsv b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.netlist.tsv
index 6165c96..585503a 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.netlist.tsv
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__o2bb2a_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	y	inand	nmid	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	y	inand	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	y	inand	nmid	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	y	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.spice b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.spice
index ee11f68..b1121e9 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.spice
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o2bb2a_m A1_N A2_N B1 B2 VGND VNB VPB VPWR X
-M1000 a_85_187# a_209_535# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=5.565e+11p ps=5.17e+06u
-M1001 VPWR a_85_187# X VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1002 VPWR A2_N a_209_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1003 a_487_167# a_209_535# a_85_187# VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=1.113e+11p ps=1.37e+06u
-M1004 VGND B2 a_487_167# VNB nshort w=420000u l=150000u
-+  ad=2.52e+11p pd=2.88e+06u as=0p ps=0u
-M1005 a_487_167# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_85_187# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 a_223_47# A1_N VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1008 a_209_535# A2_N a_223_47# VNB nshort w=420000u l=150000u
-+  ad=2.172e+11p pd=2.02e+06u as=0p ps=0u
-M1009 a_559_535# B2 a_85_187# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1010 VPWR B1 a_559_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_209_535# A1_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_209_535# a_85_187# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VGND A1_N a_223_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_209_535# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_559_535# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_85_187# a_209_535# a_487_167# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_85_187# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VGND B1 a_487_167# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_487_167# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 X a_85_187# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_223_47# A2_N a_209_535# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VPWR A1_N a_209_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_85_187# B2 a_559_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.cdl b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.cdl
index 0b73860..f2efa6b 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.cdl
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o2bb2ai_0 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.42 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nshort m=1 w=0.42 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.64 l=0.15 mult=1 sa=0.265
+MMNaoi10 nmid B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNaoi20 Y inand VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMPnand0 inand A1_N 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
+MMPnand1 inand A2_N 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
+MMPaoi10 VPWR B1 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
-MMPaoi20 Y inand VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMPaoi11 sndPB1 B2 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
+MMPaoi20 Y inand 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_lp__o2bb2ai_0
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.netlist.tsv b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.netlist.tsv
index 19ee6d6..79b034b 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.netlist.tsv
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o2bb2ai_0	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	1	0.64	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	1	0.42	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.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	pfet_01v8_hvt	1	0.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.spice b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.spice
index a8a870c..14d8874 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.spice
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o2bb2ai_0 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 a_195_56# A2_N a_117_56# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.008e+11p ps=1.32e+06u
-M1001 VPWR A2_N a_195_56# VPB phighvt w=640000u l=150000u
-+  ad=5.184e+11p pd=5.46e+06u as=1.792e+11p ps=1.84e+06u
-M1002 a_400_47# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.457e+11p pd=2.85e+06u as=2.289e+11p ps=2.77e+06u
-M1003 a_117_56# A1_N VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_486_483# B2 Y VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.792e+11p ps=1.84e+06u
-M1005 a_195_56# A1_N VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y a_195_56# VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B2 a_400_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B1 a_486_483# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_400_47# a_195_56# Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 a_486_483# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_195_56# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_117_56# A2_N a_195_56# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y B2 a_486_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 VGND A1_N a_117_56# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_400_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_195_56# Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 VGND B1 a_400_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 Y a_195_56# a_400_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR A1_N a_195_56# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.cdl b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.cdl
index 52ab240..b492d71 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.cdl
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand0 inand A1_N VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MMNaoi10 nmid B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MMNaoi20 Y inand VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MMPnand0 inand A1_N VPB pfet_01v8_hvt m=1 w=1.26 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=1.26 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.26 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.26 l=0.15 mult=1 sa=0.265
+MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o2bb2ai_1
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.netlist.tsv b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.netlist.tsv
index cea76a1..1df91fb 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.netlist.tsv
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	1	1.26	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.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	1	0.84	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	1.26	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	1.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.spice b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.spice
index 17b9218..92cd692 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.spice
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o2bb2ai_1 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 VPWR B1 a_504_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7451e+12p pd=1.033e+07u as=3.402e+11p ps=3.06e+06u
-M1001 Y a_115_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.536e+11p pd=3.24e+06u as=0p ps=0u
-M1002 a_504_367# B2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_115_52# A1_N VGND VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=5.418e+11p ps=4.65e+06u
-M1004 a_396_47# a_115_367# Y VNB nshort w=840000u l=150000u
-+  ad=4.578e+11p pd=4.45e+06u as=2.226e+11p ps=2.21e+06u
-M1005 a_115_367# A1_N VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1006 VGND B2 a_396_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A2_N a_115_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_396_47# B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_115_367# A2_N a_115_52# VNB nshort w=840000u l=150000u
-+  ad=2.856e+11p pd=2.36e+06u as=0p ps=0u
+X0 a_115_52# A2_N a_115_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND A1_N a_115_52# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VGND B1 a_396_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 Y a_115_367# a_396_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_396_47# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPWR a_115_367# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_504_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 Y B2 a_504_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR A1_N a_115_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_115_367# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.cdl b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.cdl
index 4f4a258..eb0cf47 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.cdl
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8 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
-MMNnand1 sndNA1N A2_N VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8 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
-MMNaoi10 nmid B1 VNB nshort 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
-MMNaoi11 nmid B2 VNB nshort 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
-MMNaoi20 Y inand VNB nshort 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
-MMPnand0 inand A1_N VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
+MMNaoi10 nmid B1 VNB nfet_01v8 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 phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B2 VNB nfet_01v8 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 phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
+MMNaoi20 Y inand VNB nfet_01v8 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
-MMPaoi11 sndPB1 B2 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
+MMPnand0 inand A1_N VPB pfet_01v8_hvt m=2 w=1.26 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=1.26 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.26 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.26 l=0.15 mult=1 sa=0.265
+MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o2bb2ai_2
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.netlist.tsv b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.netlist.tsv
index febb78f..6ee68a0 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.netlist.tsv
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	2	1.26	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.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	2	0.84	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	1.26	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	1.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.spice b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.spice
index 844a816..6e06068 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.spice
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__o2bb2ai_2 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 Y a_125_367# a_502_69# VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=9.828e+11p ps=9.06e+06u
-M1001 VPWR A1_N a_125_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.5074e+12p pd=1.658e+07u as=7.056e+11p ps=6.16e+06u
-M1002 a_765_367# B2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=7.56e+11p ps=6.24e+06u
-M1003 a_502_69# B2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=9.156e+11p ps=8.9e+06u
-M1004 Y a_125_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y B2 a_765_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_502_69# a_125_367# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_125_367# A1_N VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_125_69# A2_N a_125_367# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=2.352e+11p ps=2.24e+06u
-M1009 a_125_367# A2_N VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND B2 a_502_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR B1 a_765_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND B1 a_502_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_765_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A2_N a_125_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A1_N a_125_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_502_69# B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_125_69# A1_N VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_125_367# A2_N a_125_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_125_367# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A1_N a_125_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_765_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 Y B2 a_765_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR B1 a_765_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR a_125_367# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VPWR A1_N a_125_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_125_69# A2_N a_125_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_502_69# a_125_367# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_765_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR A2_N a_125_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 Y a_125_367# a_502_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VGND B1 a_502_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_125_367# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 Y a_125_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_502_69# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_125_367# A2_N a_125_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_125_69# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_125_367# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VGND B2 a_502_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 a_502_69# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.cdl b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.cdl
index 8dede51..67d6992 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.cdl
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8 m=4 w=0.84 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.84 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=4 w=0.84 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.84 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.84 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.84 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.26 l=0.15 mult=1 sa=0.265
+MMNaoi10 nmid B1 VNB nfet_01v8 m=4 w=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 phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B2 VNB nfet_01v8 m=4 w=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 phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265
+MMNaoi20 Y inand VNB nfet_01v8 m=4 w=0.84 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.26 l=0.15 mult=1 sa=0.265
+MMPnand0 inand A1_N VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
+MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o2bb2ai_4
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.netlist.tsv b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.netlist.tsv
index 949c786..4d41391 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.netlist.tsv
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	4	1.26	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.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	4	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.spice b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.spice
index d22522d..05ed6a0 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.spice
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__o2bb2ai_4 A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 VPWR A1_N a_804_39# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.0509e+12p pd=2.911e+07u as=1.4112e+12p ps=1.232e+07u
-M1001 a_1235_65# A2_N a_804_39# VNB nshort w=840000u l=150000u
-+  ad=1.218e+12p pd=1.13e+07u as=4.704e+11p ps=4.48e+06u
-M1002 Y a_804_39# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=0p ps=0u
-M1003 a_1235_65# A1_N VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=1.4784e+12p ps=1.36e+07u
-M1004 a_1235_65# A1_N VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y B2 a_132_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.449e+12p ps=1.238e+07u
-M1006 VPWR A1_N a_804_39# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_804_39# A2_N VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y a_804_39# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B1 a_132_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_35_65# B2 VGND VNB nshort w=840000u l=150000u
-+  ad=1.7388e+12p pd=1.59e+07u as=0p ps=0u
-M1011 a_35_65# a_804_39# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=5.544e+11p ps=4.68e+06u
-M1012 VPWR B1 a_132_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_804_39# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_804_39# A2_N VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_35_65# B2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_804_39# A2_N a_1235_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_35_65# B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_1235_65# A2_N a_804_39# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND B1 a_35_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_804_39# A2_N a_1235_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_132_367# B2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_804_39# A1_N VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y a_804_39# a_35_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND A1_N a_1235_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_804_39# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_804_39# A1_N VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 Y a_804_39# a_35_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR A2_N a_804_39# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND B2 a_35_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND B2 a_35_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_35_65# a_804_39# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_132_367# B2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR A2_N a_804_39# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND B1 a_35_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND A1_N a_1235_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_132_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Y B2 a_132_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_132_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_35_65# B1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_804_39# A2_N a_1235_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND B2 a_35_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 Y a_804_39# a_35_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_1235_65# A2_N a_804_39# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR a_804_39# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_35_65# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR B1 a_132_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 Y B2 a_132_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_35_65# a_804_39# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VPWR A1_N a_804_39# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_1235_65# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VPWR A2_N a_804_39# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_804_39# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_35_65# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 VGND B2 a_35_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VGND A1_N a_1235_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 VPWR B1 a_132_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_35_65# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_132_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_1235_65# A1_N VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 VGND B1 a_35_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 a_804_39# A2_N a_1235_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 a_804_39# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 VPWR A1_N a_804_39# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 a_804_39# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 a_132_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 VGND A1_N a_1235_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 VGND B1 a_35_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X28 a_1235_65# A2_N a_804_39# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 Y a_804_39# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 a_35_65# B1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X31 a_35_65# a_804_39# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X32 VPWR a_804_39# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X33 Y a_804_39# a_35_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X34 Y a_804_39# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X35 a_132_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X36 a_804_39# A1_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X37 a_132_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X38 VPWR A2_N a_804_39# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X39 Y B2 a_132_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.cdl b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.cdl
index 752271c..d286736 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.cdl
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o2bb2ai_lp 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.42 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nshort m=1 w=0.42 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=1 l=0.25 mult=1 sa=0.265
+MMNaoi10 nmid B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265
+MMNaoi11 nmid B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 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
-MMPaoi11 sndPB1 B2 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
-MMPaoi20 Y inand 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
+MMNaoi20 Y inand VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 inand A1_N 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
+MMPnand1 inand A2_N 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
+MMPaoi10 VPWR B1 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
+MMPaoi11 sndPB1 B2 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
+MMPaoi20 Y inand 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_lp__o2bb2ai_lp
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.netlist.tsv b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.netlist.tsv
index 53c872d..cc8c1c6 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.netlist.tsv
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o2bb2ai_lp	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A1_N	sndNA1N	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	1	0.42	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	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inand	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/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.spice b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.spice
index 9a5724a..d8586e3 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.spice
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o2bb2ai_lp A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 a_400_83# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=2.499e+11p ps=2.87e+06u
-M1001 a_114_57# A1_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1002 Y a_145_419# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.8e+11p pd=2.56e+06u as=9.75e+11p ps=7.95e+06u
-M1003 VGND B2 a_400_83# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR B1 a_490_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1005 VPWR A2_N a_145_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1006 a_145_419# A1_N VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_400_83# a_145_419# Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1008 a_490_419# B2 Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_145_419# A2_N a_114_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
+X0 a_145_419# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_400_83# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND B1 a_400_83# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_490_419# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 Y B2 a_490_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 VPWR a_145_419# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_114_57# A2_N a_145_419# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND A1_N a_114_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 Y a_145_419# a_400_83# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR A1_N a_145_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.cdl b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.cdl
index 36e05d5..ce181ed 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.cdl
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o2bb2ai_m 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.42 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A1_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNnand1 sndNA1N A2_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA1N A2_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid B1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi11 nmid B2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi20 Y inand VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MMNaoi10 nmid B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand A2_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR B1 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNaoi20 Y inand VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi11 sndPB1 B2 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMPnand0 inand A1_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand1 inand A2_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi10 VPWR B1 VPB pfet_01v8_hvt m=1 w=0.42 l=0.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.42 l=0.15 mult=1 sa=0.265
+MMPaoi11 sndPB1 B2 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPaoi20 Y inand VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o2bb2ai_m
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.netlist.tsv b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.netlist.tsv
index d6f0945..5699dac 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.netlist.tsv
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o2bb2ai_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA1N	A2_N	inand	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A1_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	A2_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	B1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	B1	sndPB1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPB1	B2	Y	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.spice b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.spice
index f8faf18..09b428e 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.spice
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o2bb2ai_m A1_N A2_N B1 B2 VGND VNB VPB VPWR Y
-M1000 a_110_535# A2_N a_116_81# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1001 a_410_78# B1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=2.289e+11p ps=2.77e+06u
-M1002 a_390_535# B2 Y VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1003 a_410_78# a_110_535# Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 VPWR A2_N a_110_535# VPB phighvt w=420000u l=150000u
-+  ad=3.864e+11p pd=4.36e+06u as=1.176e+11p ps=1.4e+06u
-M1005 VPWR B1 a_390_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_116_81# A1_N VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y a_110_535# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_110_535# A1_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND B2 a_410_78# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_110_535# A2_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VPWR A1_N a_110_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 Y B2 a_390_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_390_535# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 Y a_110_535# a_410_78# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_116_81# A2_N a_110_535# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND A1_N a_116_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_410_78# B2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND B1 a_410_78# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR a_110_535# Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_0.cdl b/cells/o311a/sky130_fd_sc_lp__o311a_0.cdl
index c8009df..ca01d77 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_0.cdl
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_0.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__o311a_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPA2 sndA2 A3 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
+MMPB0 VPWR B1 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
+MMPC0 VPWR C1 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
+MMIPX X y 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.42 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.42 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o311a_0
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_0.netlist.tsv b/cells/o311a/sky130_fd_sc_lp__o311a_0.netlist.tsv
index 3441231..a4fe35b 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_0.netlist.tsv
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_0.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__o311a_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8_hvt	1	0.64	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.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o311a/sky130_fd_sc_lp__o311a_0.spice b/cells/o311a/sky130_fd_sc_lp__o311a_0.spice
index 3d267bf..b1c6b1b 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_0.spice
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_0.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o311a_0 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 VPWR a_96_161# X VPB phighvt w=640000u l=150000u
-+  ad=4.736e+11p pd=4.04e+06u as=1.696e+11p ps=1.81e+06u
-M1001 a_96_161# C1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=3.68e+11p pd=3.71e+06u as=0p ps=0u
-M1002 VGND a_96_161# X VNB nshort w=420000u l=150000u
-+  ad=2.814e+11p pd=3.02e+06u as=2.541e+11p ps=2.05e+06u
-M1003 a_270_481# A1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.92e+11p pd=1.88e+06u as=0p ps=0u
-M1004 a_292_55# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=0p ps=0u
-M1005 VGND A2 a_292_55# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_360_481# A2 a_270_481# VPB phighvt w=640000u l=150000u
-+  ad=1.92e+11p pd=1.88e+06u as=0p ps=0u
-M1007 a_96_161# A3 a_360_481# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_564_55# B1 a_292_55# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1009 VPWR B1 a_96_161# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_96_161# C1 a_564_55# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1011 a_292_55# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR C1 a_96_161# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 X a_96_161# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_564_55# C1 a_96_161# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_360_481# A3 a_96_161# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 VPWR A1 a_270_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 X a_96_161# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 VGND A3 a_292_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND A1 a_292_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_292_55# B1 a_564_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_292_55# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_270_481# A2 a_360_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 a_96_161# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_1.cdl b/cells/o311a/sky130_fd_sc_lp__o311a_1.cdl
index ac264e3..6cc71ec 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_1.cdl
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o311a_1
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_1.netlist.tsv b/cells/o311a/sky130_fd_sc_lp__o311a_1.netlist.tsv
index 6f3cee5..aa38933 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_1.netlist.tsv
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_1.spice b/cells/o311a/sky130_fd_sc_lp__o311a_1.spice
index 430a7ae..296f57f 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_1.spice
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o311a_1 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 a_80_21# A3 a_356_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=8.631e+11p pd=6.41e+06u as=3.843e+11p ps=3.13e+06u
-M1001 VGND A2 a_267_47# VNB nshort w=840000u l=150000u
-+  ad=8.988e+11p pd=5.5e+06u as=6.174e+11p ps=4.83e+06u
-M1002 VPWR a_80_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=9.828e+11p pd=6.6e+06u as=3.339e+11p ps=3.05e+06u
-M1003 VGND a_80_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1004 VPWR B1 a_80_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_267_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_267_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.717e+11p pd=3.11e+06u as=0p ps=0u
-M1007 a_591_47# B1 a_267_47# VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1008 a_80_21# C1 a_591_47# VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1009 a_80_21# C1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_356_367# A2 a_267_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_267_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_80_21# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_267_47# B1 a_591_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_356_367# A3 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR A1 a_267_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_267_367# A2 a_356_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_591_47# C1 a_80_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_267_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VGND A1 a_267_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VPWR C1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VGND A3 a_267_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_2.cdl b/cells/o311a/sky130_fd_sc_lp__o311a_2.cdl
index a92400c..006318c 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_2.cdl
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 pndB B1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNC0 y C1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 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_lp__o311a_2
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_2.netlist.tsv b/cells/o311a/sky130_fd_sc_lp__o311a_2.netlist.tsv
index db280f0..981bcb0 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_2.netlist.tsv
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_2.spice b/cells/o311a/sky130_fd_sc_lp__o311a_2.spice
index 7f506a7..ee2d24f 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_2.spice
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__o311a_2 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 a_355_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=1.4238e+12p ps=9.82e+06u
-M1001 a_85_21# C1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=9.702e+11p pd=6.58e+06u as=0p ps=0u
-M1002 a_355_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=6.51e+11p pd=4.91e+06u as=1.0752e+12p ps=7.6e+06u
-M1003 VPWR a_85_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1004 VGND A2 a_355_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_85_21# A3 a_427_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=4.914e+11p ps=3.3e+06u
-M1006 VPWR B1 a_85_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_85_21# C1 a_679_47# VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=1.764e+11p ps=2.1e+06u
-M1008 a_427_367# A2 a_355_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_355_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_679_47# B1 a_355_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_85_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_85_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1013 X a_85_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_355_367# A2 a_427_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_85_21# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 X a_85_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 X a_85_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_679_47# C1 a_85_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND A1 a_355_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR a_85_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VPWR C1 a_85_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND A3 a_355_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_427_367# A3 a_85_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR A1 a_355_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_355_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_355_47# B1 a_679_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VGND a_85_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_4.cdl b/cells/o311a/sky130_fd_sc_lp__o311a_4.cdl
index 2eb2c34..a73054c 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_4.cdl
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 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
-MMPA2 sndA2 A3 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 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 phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 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 phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 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=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
-MMNA1 pndA A2 VNB nshort 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
-MMNA2 pndA A3 VNB nshort 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
-MMNB0 pndB B1 VNB nshort 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
-MMNC0 y C1 VNB nshort 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
-MMINX X y VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=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_lp__o311a_4
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_4.netlist.tsv b/cells/o311a/sky130_fd_sc_lp__o311a_4.netlist.tsv
index ac636ec..a52f5c4 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_4.netlist.tsv
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_4.spice b/cells/o311a/sky130_fd_sc_lp__o311a_4.spice
index e5ac715..9adc5f9 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_4.spice
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_lp__o311a_4 A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 X a_81_23# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=1.806e+12p ps=1.438e+07u
-M1001 a_731_47# B1 a_476_47# VNB nshort w=840000u l=150000u
-+  ad=1.1508e+12p pd=1.114e+07u as=6.804e+11p ps=6.66e+06u
-M1002 VGND A2 a_731_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_81_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.1735e+12p pd=1.857e+07u as=7.056e+11p ps=6.16e+06u
-M1004 a_910_345# A3 a_81_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0206e+12p pd=9.18e+06u as=1.0584e+12p ps=9.24e+06u
-M1005 a_1196_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0206e+12p pd=9.18e+06u as=0p ps=0u
-M1006 VGND a_81_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR C1 a_81_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_81_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_476_47# B1 a_731_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_81_23# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_910_345# A2 a_1196_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_81_23# C1 a_476_47# VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1013 a_731_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR a_81_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A3 a_731_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_731_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_731_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X a_81_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_81_23# A3 a_910_345# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR A1 a_1196_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_81_23# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_476_47# C1 a_81_23# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND A1 a_731_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_81_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR B1 a_81_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1196_367# A2 a_910_345# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_81_23# C1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A3 a_731_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_1196_367# A2 a_910_345# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_731_47# B1 a_476_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VPWR C1 a_81_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_81_23# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_910_345# A2 a_1196_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_731_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VGND A2 a_731_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_476_47# C1 a_81_23# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_731_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_81_23# C1 a_476_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VPWR a_81_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_476_47# B1 a_731_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 X a_81_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 VPWR A1 a_1196_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VGND a_81_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_1196_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_81_23# A3 a_910_345# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 a_81_23# C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VGND A1 a_731_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 VPWR a_81_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 X a_81_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 a_731_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 X a_81_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 a_910_345# A3 a_81_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 VGND a_81_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 X a_81_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 VPWR B1 a_81_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_lp.cdl b/cells/o311a/sky130_fd_sc_lp__o311a_lp.cdl
index 77f0071..e3a262e 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_lp.cdl
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_lp.cdl
@@ -16,30 +16,30 @@
 
 .SUBCKT sky130_fd_sc_lp__o311a_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPA2 sndA2 A3 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
+MMPB0 VPWR B1 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
+MMPC0 VPWR C1 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
+MMIPX X y 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=1 w=0.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net80 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net80 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o311a_lp
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_lp.netlist.tsv b/cells/o311a/sky130_fd_sc_lp__o311a_lp.netlist.tsv
index c607dea..3c937e7 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_lp.netlist.tsv
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_lp.netlist.tsv
@@ -1,15 +1,15 @@
 sky130_fd_sc_lp__o311a_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	net80	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net80	y	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	net80	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net80	y	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/o311a/sky130_fd_sc_lp__o311a_lp.spice b/cells/o311a/sky130_fd_sc_lp__o311a_lp.spice
index 5ade76f..ffd5662 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_lp.spice
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_lp.spice
@@ -16,30 +16,17 @@
 
 
 .subckt sky130_fd_sc_lp__o311a_lp A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 VPWR B1 a_84_115# VPB phighvt w=1e+06u l=250000u
-+  ad=6.45e+11p pd=5.29e+06u as=5.75e+11p ps=5.15e+06u
-M1001 a_114_141# a_84_115# X VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1002 VGND A2 a_273_141# VNB nshort w=420000u l=150000u
-+  ad=3.045e+11p pd=3.13e+06u as=2.352e+11p ps=2.8e+06u
-M1003 a_356_419# A2 a_258_419# VPB phighvt w=1e+06u l=250000u
-+  ad=2.9e+11p pd=2.58e+06u as=2.4e+11p ps=2.48e+06u
-M1004 a_84_115# C1 a_563_141# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1005 a_84_115# C1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_273_141# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_273_141# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_563_141# B1 a_273_141# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_84_115# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1010 a_84_115# A3 a_356_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_84_115# a_114_141# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_258_419# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_84_115# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 VPWR C1 a_84_115# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_84_115# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 VGND A3 a_273_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR A1 a_258_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_273_141# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_356_419# A3 a_84_115# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_563_141# C1 a_84_115# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_258_419# A2 a_356_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_114_141# a_84_115# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_273_141# B1 a_563_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 X a_84_115# a_114_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND A1 a_273_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_m.cdl b/cells/o311a/sky130_fd_sc_lp__o311a_m.cdl
index d4a7b40..b670a56 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_m.cdl
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_m.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__o311a_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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.42 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.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 y C1 VNB nfet_01v8 m=1 w=0.42 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.42 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o311a_m
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_m.netlist.tsv b/cells/o311a/sky130_fd_sc_lp__o311a_m.netlist.tsv
index b3d646d..d09e5a8 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_m.netlist.tsv
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_m.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__o311a_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	y	C1	pndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8_hvt	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	y	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o311a/sky130_fd_sc_lp__o311a_m.spice b/cells/o311a/sky130_fd_sc_lp__o311a_m.spice
index c9ba74b..1b64a01 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_m.spice
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_m.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o311a_m A1 A2 A3 B1 C1 VGND VNB VPB VPWR X
-M1000 a_314_397# A2 a_242_397# VPB phighvt w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=8.82e+10p ps=1.26e+06u
-M1001 a_93_153# C1 a_530_47# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.638e+11p ps=1.62e+06u
-M1002 VPWR B1 a_93_153# VPB phighvt w=420000u l=150000u
-+  ad=3.045e+11p pd=3.13e+06u as=2.835e+11p ps=3.03e+06u
-M1003 a_250_47# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.814e+11p pd=3.02e+06u as=2.352e+11p ps=2.8e+06u
-M1004 a_242_397# A1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_93_153# A3 a_314_397# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_93_153# C1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_530_47# B1 a_250_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A2 a_250_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_93_153# X VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1010 a_250_47# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_93_153# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 VGND A1 a_250_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_93_153# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_250_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 X a_93_153# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VPWR A1 a_242_397# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_250_47# B1 a_530_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR C1 a_93_153# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_530_47# C1 a_93_153# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND A3 a_250_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_314_397# A3 a_93_153# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_242_397# A2 a_314_397# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 X a_93_153# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_0.cdl b/cells/o311ai/sky130_fd_sc_lp__o311ai_0.cdl
index d46c063..cd3574c 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_0.cdl
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o311ai_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPA2 sndA2 A3 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
+MMPB0 VPWR B1 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
+MMPC0 VPWR C1 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
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=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_lp__o311ai_0
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_0.netlist.tsv b/cells/o311ai/sky130_fd_sc_lp__o311ai_0.netlist.tsv
index d04928d..fbb6fcd 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_0.netlist.tsv
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o311ai_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	1	0.64	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.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_0.spice b/cells/o311ai/sky130_fd_sc_lp__o311ai_0.spice
index 3a12f94..4793082 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_0.spice
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o311ai_0 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 VGND A2 a_193_48# VNB nshort w=420000u l=150000u
-+  ad=2.541e+11p pd=2.89e+06u as=2.352e+11p ps=2.8e+06u
-M1001 a_193_466# A1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=4.128e+11p ps=3.85e+06u
-M1002 a_265_466# A2 a_193_466# VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1003 Y C1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=3.872e+11p pd=3.77e+06u as=0p ps=0u
-M1004 Y A3 a_265_466# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_193_48# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_193_48# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR B1 Y VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y C1 a_463_48# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.008e+11p ps=1.32e+06u
-M1009 a_463_48# B1 a_193_48# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A1 a_193_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_463_48# C1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 VPWR A1 a_193_466# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 a_193_466# A2 a_265_466# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_193_48# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_265_466# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 VGND A3 a_193_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_193_48# B1 a_463_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_1.cdl b/cells/o311ai/sky130_fd_sc_lp__o311ai_1.cdl
index 5482bd8..17b03ff 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_1.cdl
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=1.26 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.84 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.84 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o311ai_1
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_1.netlist.tsv b/cells/o311ai/sky130_fd_sc_lp__o311ai_1.netlist.tsv
index 3a3c00e..f334372 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_1.netlist.tsv
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_1.spice b/cells/o311ai/sky130_fd_sc_lp__o311ai_1.spice
index 7d8d24a..0e6033c 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_1.spice
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o311ai_1 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_173_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=7.56e+11p pd=5.16e+06u as=5.25e+11p ps=4.61e+06u
-M1001 a_261_367# A2 a_173_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.906e+11p pd=3.14e+06u as=3.654e+11p ps=3.1e+06u
-M1002 a_515_47# B1 a_173_47# VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1003 Y C1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=8.253e+11p pd=6.35e+06u as=9.387e+11p ps=6.53e+06u
-M1004 Y C1 a_515_47# VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1005 Y A3 a_261_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_173_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_173_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_173_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A1 a_173_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND A3 a_173_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_173_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_515_47# C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_261_367# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VPWR A1 a_173_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_173_47# B1 a_515_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_173_367# A2 a_261_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_2.cdl b/cells/o311ai/sky130_fd_sc_lp__o311ai_2.cdl
index a4634f4..0050680 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_2.cdl
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 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
-MMPA2 sndA2 A3 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 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 phighvt m=2 w=1.26 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.84 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.84 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 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_lp__o311ai_2
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_2.netlist.tsv b/cells/o311ai/sky130_fd_sc_lp__o311ai_2.netlist.tsv
index 4030b88..5b0d9c1 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_2.netlist.tsv
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_2.spice b/cells/o311ai/sky130_fd_sc_lp__o311ai_2.spice
index 615003d..c3eb06f 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_2.spice
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__o311ai_2 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_35_47# B1 a_710_47# VNB nshort w=840000u l=150000u
-+  ad=1.1844e+12p pd=1.122e+07u as=4.704e+11p ps=4.48e+06u
-M1001 VPWR C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.5372e+12p pd=1e+07u as=1.3734e+12p ps=1.226e+07u
-M1002 a_35_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=9.912e+11p ps=7.4e+06u
-M1003 a_290_367# A2 a_35_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=1.0206e+12p ps=9.18e+06u
-M1004 VPWR A1 a_35_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_290_367# A3 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A2 a_35_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_710_47# C1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.452e+11p ps=4.42e+06u
-M1009 a_710_47# B1 a_35_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y C1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y C1 a_710_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_35_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A3 a_35_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_35_367# A2 a_290_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 Y A3 a_290_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_35_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A1 a_35_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_35_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_35_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_290_367# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_290_367# A2 a_35_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_35_367# A2 a_290_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND A1 a_35_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_35_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_710_47# C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VGND A2 a_35_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VGND A3 a_35_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_35_47# B1 a_710_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_35_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 Y A3 a_290_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_710_47# B1 a_35_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 Y C1 a_710_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_35_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 VPWR A1 a_35_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_4.cdl b/cells/o311ai/sky130_fd_sc_lp__o311ai_4.cdl
index bdead85..ddfc721 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_4.cdl
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=4 w=0.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=4 w=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 phighvt m=4 w=1.26 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.84 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.84 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.84 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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=4 w=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_lp__o311ai_4
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_4.netlist.tsv b/cells/o311ai/sky130_fd_sc_lp__o311ai_4.netlist.tsv
index 674a3bd..a456777 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_4.netlist.tsv
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	4	0.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	4	1.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_4.spice b/cells/o311ai/sky130_fd_sc_lp__o311ai_4.spice
index dd86083..a8d5656 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_4.spice
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__o311ai_4 A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_113_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=1.932e+12p pd=1.804e+07u as=1.6212e+12p ps=1.562e+07u
-M1001 a_457_367# A2 a_30_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=1.7262e+12p ps=1.534e+07u
-M1002 a_113_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.1168e+12p pd=1.848e+07u as=2.4318e+12p ps=2.15e+07u
-M1004 Y C1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_30_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_113_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_1166_65# C1 Y VNB nshort w=840000u l=150000u
-+  ad=1.2432e+12p pd=1.136e+07u as=6.3e+11p ps=4.86e+06u
-M1009 a_113_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1166_65# B1 a_113_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_113_47# B1 a_1166_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_1166_65# C1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_30_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y A3 a_457_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A2 a_113_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A1 a_113_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y C1 a_1166_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_113_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_30_367# A2 a_457_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y A3 a_457_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR C1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y C1 a_1166_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_113_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_30_367# A2 a_457_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND A3 a_113_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR A1 a_30_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND A1 a_113_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_113_47# B1 a_1166_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VPWR A1 a_30_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_457_367# A3 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 Y B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y C1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1166_65# B1 a_113_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_457_367# A2 a_30_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_457_367# A3 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND A3 a_113_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND A2 a_113_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_113_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND A2 a_113_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_113_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_457_367# A2 a_30_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VGND A3 a_113_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_113_47# B1 a_1166_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 Y C1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VGND A2 a_113_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_113_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VGND A1 a_113_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_113_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VPWR A1 a_30_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_113_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_1166_65# C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 Y C1 a_1166_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 VGND A3 a_113_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 a_30_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 Y A3 a_457_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 a_30_367# A2 a_457_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 a_30_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 Y A3 a_457_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 a_1166_65# B1 a_113_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 a_1166_65# C1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 a_457_367# A2 a_30_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 a_457_367# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X32 VPWR A1 a_30_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X33 a_30_367# A2 a_457_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X34 a_457_367# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X35 Y C1 a_1166_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X36 a_113_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X37 a_1166_65# B1 a_113_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X38 VGND A1 a_113_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X39 a_113_47# B1 a_1166_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.cdl b/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.cdl
index 3b48a49..715e3c7 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.cdl
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o311ai_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPA2 sndA2 A3 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
+MMPB0 VPWR B1 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
+MMPC0 VPWR C1 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
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=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_lp__o311ai_lp
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.netlist.tsv b/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.netlist.tsv
index 0f7480a..762410c 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.netlist.tsv
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o311ai_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPC0	MOSFET	VPWR	C1	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.spice b/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.spice
index 855e257..6777ca0 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.spice
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o311ai_lp A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 a_232_419# A2 a_134_419# VPB phighvt w=1e+06u l=250000u
-+  ad=2.6e+11p pd=2.52e+06u as=2.4e+11p ps=2.48e+06u
-M1001 Y A3 a_232_419# VPB phighvt w=1e+06u l=250000u
-+  ad=5.65e+11p pd=5.13e+06u as=0p ps=0u
-M1002 Y C1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=5.85e+11p ps=5.17e+06u
-M1003 VGND A2 a_114_148# VNB nshort w=420000u l=150000u
-+  ad=3.255e+11p pd=3.23e+06u as=3.15e+11p ps=3.18e+06u
-M1004 a_114_148# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 Y C1 a_452_148# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1006 VPWR B1 Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_452_148# B1 a_114_148# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_114_148# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_134_419# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A1 a_114_148# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR A1 a_134_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_134_419# A2 a_232_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_114_148# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_114_148# B1 a_452_148# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND A3 a_114_148# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_232_419# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_452_148# C1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_m.cdl b/cells/o311ai/sky130_fd_sc_lp__o311ai_m.cdl
index 57a9e58..6cb0215 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_m.cdl
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o311ai_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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.42 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.42 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.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 pndB B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPC0 VPWR C1 VPB phighvt m=1 w=0.42 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.42 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.42 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.42 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNC0 Y C1 VNB nfet_01v8 m=1 w=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_lp__o311ai_m
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_m.netlist.tsv b/cells/o311ai/sky130_fd_sc_lp__o311ai_m.netlist.tsv
index 35719ea..316baf1 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_m.netlist.tsv
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o311ai_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPC0	MOSFET	VPWR	C1	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	pndB	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNC0	MOSFET	Y	C1	pndB	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	pndB	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNC0	MOSFET	Y	C1	pndB	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_m.spice b/cells/o311ai/sky130_fd_sc_lp__o311ai_m.spice
index 9384ce0..31e912f 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_m.spice
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o311ai_m A1 A2 A3 B1 C1 VGND VNB VPB VPWR Y
-M1000 VPWR B1 Y VPB phighvt w=420000u l=150000u
-+  ad=3.5825e+11p pd=3.42e+06u as=2.289e+11p ps=2.77e+06u
-M1001 a_220_403# A2 a_148_403# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=8.82e+10p ps=1.26e+06u
-M1002 Y A3 a_220_403# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y C1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_136_82# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=2.289e+11p ps=2.77e+06u
-M1005 a_148_403# A1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_394_82# B1 a_136_82# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1007 Y C1 a_394_82# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1008 a_136_82# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A2 a_136_82# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_136_82# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_148_403# A2 a_220_403# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_220_403# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VGND A3 a_136_82# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_136_82# B1 a_394_82# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR A1 a_148_403# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND A1 a_136_82# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR C1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_394_82# C1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_0.cdl b/cells/o31a/sky130_fd_sc_lp__o31a_0.cdl
index 43e59ac..1a4b9d7 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_0.cdl
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o31a_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPA2 sndA2 A3 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
+MMPB0 VPWR B1 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
+MMIPX X y 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o31a_0
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_0.netlist.tsv b/cells/o31a/sky130_fd_sc_lp__o31a_0.netlist.tsv
index 839b88a..8136d12 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_0.netlist.tsv
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o31a_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8_hvt	1	0.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o31a/sky130_fd_sc_lp__o31a_0.spice b/cells/o31a/sky130_fd_sc_lp__o31a_0.spice
index 55eee4b..da43256 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_0.spice
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o31a_0 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 a_270_55# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.688e+11p pd=2.96e+06u as=3.108e+11p ps=3.16e+06u
-M1001 VPWR a_90_309# X VPB phighvt w=640000u l=150000u
-+  ad=4.736e+11p pd=4.04e+06u as=1.696e+11p ps=1.81e+06u
-M1002 a_354_481# A2 a_270_481# VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=1.728e+11p ps=1.82e+06u
-M1003 a_270_55# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_270_481# A1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A2 a_270_55# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR B1 a_90_309# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.112e+11p ps=1.94e+06u
-M1007 a_90_309# B1 a_270_55# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1008 VGND a_90_309# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1009 a_90_309# A3 a_354_481# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_270_481# A2 a_354_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 VGND A3 a_270_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_270_55# B1 a_90_309# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR A1 a_270_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 X a_90_309# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND A1 a_270_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_270_55# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 X a_90_309# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 a_354_481# A3 a_90_309# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 a_90_309# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_1.cdl b/cells/o31a/sky130_fd_sc_lp__o31a_1.cdl
index 37b546b..fc0bcab 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_1.cdl
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o31a_1
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_1.netlist.tsv b/cells/o31a/sky130_fd_sc_lp__o31a_1.netlist.tsv
index 14a2ed7..350e1d6 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_1.netlist.tsv
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_1.spice b/cells/o31a/sky130_fd_sc_lp__o31a_1.spice
index fd3dae3..a469a2f 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_1.spice
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o31a_1 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 VGND A2 a_275_49# VNB nshort w=840000u l=150000u
-+  ad=8.82e+11p pd=5.46e+06u as=4.914e+11p ps=4.53e+06u
-M1001 a_86_23# A3 a_367_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.914e+11p pd=3.3e+06u as=3.654e+11p ps=3.1e+06u
-M1002 a_275_49# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR a_86_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.1466e+12p pd=6.86e+06u as=3.339e+11p ps=3.05e+06u
-M1004 a_275_49# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_86_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1006 VPWR B1 a_86_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_275_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.906e+11p pd=3.14e+06u as=0p ps=0u
-M1008 a_86_23# B1 a_275_49# VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1009 a_367_367# A2 a_275_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A1 a_275_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_275_367# A2 a_367_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 X a_86_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 X a_86_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_86_23# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_275_49# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_367_367# A3 a_86_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VPWR A1 a_275_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND A3 a_275_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_275_49# B1 a_86_23# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_2.cdl b/cells/o31a/sky130_fd_sc_lp__o31a_2.cdl
index 0d6ec5a..2f4f63f 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_2.cdl
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 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_lp__o31a_2
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_2.netlist.tsv b/cells/o31a/sky130_fd_sc_lp__o31a_2.netlist.tsv
index 94a6b83..e50579f 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_2.netlist.tsv
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_2.spice b/cells/o31a/sky130_fd_sc_lp__o31a_2.spice
index 75bcd99..650a047 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_2.spice
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o31a_2 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 VGND A2 a_355_47# VNB nshort w=840000u l=150000u
-+  ad=9.786e+11p pd=7.37e+06u as=5.964e+11p ps=4.78e+06u
-M1001 a_355_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=1.4364e+12p ps=9.84e+06u
-M1002 VPWR a_85_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1003 a_85_21# B1 a_355_47# VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1004 a_355_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_85_21# A3 a_427_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.914e+11p pd=3.3e+06u as=4.914e+11p ps=3.3e+06u
-M1006 a_427_367# A2 a_355_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_355_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_85_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B1 a_85_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_85_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1011 X a_85_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_355_47# B1 a_85_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_355_367# A2 a_427_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 X a_85_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 X a_85_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND A1 a_355_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPWR a_85_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_355_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_85_21# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND A3 a_355_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_427_367# A3 a_85_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR A1 a_355_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VGND a_85_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_4.cdl b/cells/o31a/sky130_fd_sc_lp__o31a_4.cdl
index 7f67311..8edd57b 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_4.cdl
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 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
-MMPA2 sndA2 A3 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 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 phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 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=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
-MMNA1 pndA A2 VNB nshort 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
-MMNA2 pndA A3 VNB nshort 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
-MMNB0 y B1 VNB nshort 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
-MMINX X y VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=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_lp__o31a_4
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_4.netlist.tsv b/cells/o31a/sky130_fd_sc_lp__o31a_4.netlist.tsv
index 37c992e..b1378e6 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_4.netlist.tsv
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_4.spice b/cells/o31a/sky130_fd_sc_lp__o31a_4.spice
index 4c50d81..e3bfff9 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_4.spice
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_4.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_lp__o31a_4 A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 VPWR a_101_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7262e+12p pd=1.534e+07u as=7.056e+11p ps=6.16e+06u
-M1001 X a_101_23# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=1.5162e+12p ps=1.369e+07u
-M1002 VGND A2 a_528_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=1.2348e+12p ps=1.134e+07u
-M1003 VGND A3 a_528_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_528_65# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_975_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=9.009e+11p pd=6.47e+06u as=0p ps=0u
-M1006 VPWR B1 a_101_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1007 a_975_367# A2 a_720_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.0206e+12p ps=9.18e+06u
-M1008 a_528_65# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_101_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_101_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR A1 a_975_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_101_23# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_101_23# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_101_23# B1 a_528_65# VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1015 a_720_367# A3 a_101_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_101_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND a_101_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_528_65# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_101_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_720_367# A2 a_975_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_528_65# B1 a_101_23# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A1 a_528_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_101_23# A3 a_720_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_975_367# A2 a_720_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_101_23# B1 a_528_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_528_65# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 X a_101_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND a_101_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND A1 a_528_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 X a_101_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_101_23# A3 a_720_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_720_367# A3 a_101_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_528_65# B1 a_101_23# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VGND A3 a_528_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VGND a_101_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_528_65# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_720_367# A2 a_975_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 X a_101_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_528_65# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 VGND A2 a_528_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 VPWR a_101_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VPWR A1 a_975_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_975_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 VPWR a_101_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 a_101_23# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 X a_101_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 VPWR B1 a_101_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_lp.cdl b/cells/o31a/sky130_fd_sc_lp__o31a_lp.cdl
index c5270e1..210d9b1 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_lp.cdl
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_lp.cdl
@@ -16,26 +16,26 @@
 
 .SUBCKT sky130_fd_sc_lp__o31a_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPA2 sndA2 A3 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
+MMPB0 VPWR B1 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
+MMIPX X y 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=1 w=0.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=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 net68 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net68 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o31a_lp
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_lp.netlist.tsv b/cells/o31a/sky130_fd_sc_lp__o31a_lp.netlist.tsv
index 34603fa..bc1368e 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_lp.netlist.tsv
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_lp.netlist.tsv
@@ -1,13 +1,13 @@
 sky130_fd_sc_lp__o31a_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	net68	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net68	y	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	net68	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net68	y	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/o31a/sky130_fd_sc_lp__o31a_lp.spice b/cells/o31a/sky130_fd_sc_lp__o31a_lp.spice
index a85f64e..4a9038c 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_lp.spice
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_lp.spice
@@ -16,26 +16,15 @@
 
 
 .subckt sky130_fd_sc_lp__o31a_lp A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 a_516_57# a_37_57# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.898e+11p ps=3.06e+06u
-M1001 X a_37_57# a_516_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1002 a_360_410# A2 a_256_410# VPB phighvt w=1e+06u l=250000u
-+  ad=2.9e+11p pd=2.58e+06u as=2.7e+11p ps=2.54e+06u
-M1003 X a_37_57# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=5.65e+11p ps=5.13e+06u
-M1004 VGND A3 a_140_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.478e+11p ps=2.86e+06u
-M1005 a_140_57# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_256_410# A3 a_37_57# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1007 VPWR A1 a_360_410# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A1 a_140_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_140_57# B1 a_37_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.533e+11p ps=1.57e+06u
-M1010 a_37_57# B1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_37_57# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 VGND a_37_57# a_516_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_37_57# B1 a_140_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_360_410# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 VGND A2 a_140_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR B1 a_37_57# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_140_57# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_140_57# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_256_410# A2 a_360_410# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_516_57# a_37_57# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_37_57# A3 a_256_410# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_m.cdl b/cells/o31a/sky130_fd_sc_lp__o31a_m.cdl
index fbcd66d..614b0c2 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_m.cdl
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o31a_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o31a_m
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_m.netlist.tsv b/cells/o31a/sky130_fd_sc_lp__o31a_m.netlist.tsv
index 4be62a6..8e6d9c3 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_m.netlist.tsv
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o31a_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o31a/sky130_fd_sc_lp__o31a_m.spice b/cells/o31a/sky130_fd_sc_lp__o31a_m.spice
index 9c06d28..2f20491 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_m.spice
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o31a_m A1 A2 A3 B1 VGND VNB VPB VPWR X
-M1000 a_239_47# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.583e+11p pd=2.91e+06u as=2.751e+11p ps=2.99e+06u
-M1001 VGND A2 a_239_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR B1 a_95_153# VPB phighvt w=420000u l=150000u
-+  ad=2.751e+11p pd=2.99e+06u as=1.638e+11p ps=1.62e+06u
-M1003 VPWR a_95_153# X VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 a_311_397# A2 a_239_397# VPB phighvt w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=8.82e+10p ps=1.26e+06u
-M1005 a_95_153# B1 a_239_47# VNB nshort w=420000u l=150000u
-+  ad=2.058e+11p pd=1.82e+06u as=0p ps=0u
-M1006 VGND a_95_153# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 a_239_47# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_239_397# A1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_95_153# A3 a_311_397# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_239_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_95_153# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 X a_95_153# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_311_397# A3 a_95_153# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 X a_95_153# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND A1 a_239_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND A3 a_239_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_239_397# A2 a_311_397# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VPWR A1 a_239_397# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_239_47# B1 a_95_153# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_0.cdl b/cells/o31ai/sky130_fd_sc_lp__o31ai_0.cdl
index 3d82742..1f1273b 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_0.cdl
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_0.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__o31ai_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPA2 sndA2 A3 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
+MMPB0 VPWR B1 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
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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.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.42 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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o31ai_0
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_0.netlist.tsv b/cells/o31ai/sky130_fd_sc_lp__o31ai_0.netlist.tsv
index 1a3a4dc..c855728 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_0.netlist.tsv
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_0.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__o31ai_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	1	0.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_0.spice b/cells/o31ai/sky130_fd_sc_lp__o31ai_0.spice
index 261af3c..b794879 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_0.spice
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_0.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__o31ai_0 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 a_146_483# A1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=3.392e+11p ps=3.62e+06u
-M1001 a_224_483# A2 a_146_483# VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1002 a_138_65# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=2.709e+11p ps=2.97e+06u
-M1003 VPWR B1 Y VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1004 Y B1 a_138_65# VNB nshort w=420000u l=150000u
-+  ad=2.541e+11p pd=2.05e+06u as=0p ps=0u
-M1005 Y A3 a_224_483# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_138_65# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A2 a_138_65# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_138_65# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_224_483# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_138_65# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND A3 a_138_65# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR A1 a_146_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 a_146_483# A2 a_224_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 VGND A1 a_138_65# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_1.cdl b/cells/o31ai/sky130_fd_sc_lp__o31ai_1.cdl
index 6415fcd..573ae62 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_1.cdl
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 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.84 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.84 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.84 l=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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o31ai_1
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_1.netlist.tsv b/cells/o31ai/sky130_fd_sc_lp__o31ai_1.netlist.tsv
index 4cadbdf..beb4d6f 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_1.netlist.tsv
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_1.spice b/cells/o31ai/sky130_fd_sc_lp__o31ai_1.spice
index 9cd9654..2f2dd23 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_1.spice
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__o31ai_1 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 VPWR B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.678e+11p pd=6.1e+06u as=8.001e+11p ps=3.79e+06u
-M1001 Y B1 a_110_47# VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=5.292e+11p ps=4.62e+06u
-M1002 Y A3 a_182_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=4.914e+11p ps=3.3e+06u
-M1003 a_110_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=7.434e+11p ps=5.13e+06u
-M1004 a_110_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A2 a_110_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_182_367# A2 a_110_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=2.646e+11p ps=2.94e+06u
-M1007 a_110_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_182_367# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VGND A1 a_110_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_110_367# A2 a_182_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR A1 a_110_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_110_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VGND A3 a_110_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_110_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_2.cdl b/cells/o31ai/sky130_fd_sc_lp__o31ai_2.cdl
index 9e3031e..28ff398 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_2.cdl
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 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
-MMPA2 sndA2 A3 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.26 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.84 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.84 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.84 l=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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 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_lp__o31ai_2
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_2.netlist.tsv b/cells/o31ai/sky130_fd_sc_lp__o31ai_2.netlist.tsv
index c0ca221..4fed87d 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_2.netlist.tsv
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_2.spice b/cells/o31ai/sky130_fd_sc_lp__o31ai_2.spice
index 1df1b26..6a3a18b 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_2.spice
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__o31ai_2 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 a_58_65# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=1.2096e+12p pd=1.128e+07u as=1.0584e+12p ps=7.56e+06u
-M1001 a_58_65# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1002 VPWR A1 a_44_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=1.0206e+12p ps=9.18e+06u
-M1003 VGND A2 a_58_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_299_367# A2 a_44_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=8.064e+11p pd=6.32e+06u as=0p ps=0u
-M1005 a_299_367# A3 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.2159e+12p ps=9.49e+06u
-M1006 Y A3 a_299_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A3 a_58_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_44_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A1 a_58_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y B1 a_58_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_58_65# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_58_65# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_44_367# A2 a_299_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A2 a_58_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_58_65# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_44_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND A1 a_58_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 Y B1 a_58_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Y A3 a_299_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_58_65# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_44_367# A2 a_299_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR A1 a_44_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_58_65# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_58_65# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VGND A3 a_58_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_299_367# A2 a_44_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_299_367# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_4.cdl b/cells/o31ai/sky130_fd_sc_lp__o31ai_4.cdl
index 8f741ee..d82011f 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_4.cdl
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=4 w=0.84 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.26 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.84 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.84 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.84 l=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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=4 w=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_lp__o31ai_4
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_4.netlist.tsv b/cells/o31ai/sky130_fd_sc_lp__o31ai_4.netlist.tsv
index 78fd372..e810b4a 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_4.netlist.tsv
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	4	0.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_4.spice b/cells/o31ai/sky130_fd_sc_lp__o31ai_4.spice
index 513454e..a4a8de0 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_4.spice
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_4.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_lp__o31ai_4 A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 VPWR B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.0412e+12p pd=1.332e+07u as=1.5372e+12p ps=1.252e+07u
-M1001 a_132_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=0p ps=0u
-M1002 Y B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A2 a_132_47# VNB nshort w=840000u l=150000u
-+  ad=1.7472e+12p pd=1.592e+07u as=1.8816e+12p ps=1.792e+07u
-M1005 a_132_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y A3 a_49_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.7829e+12p ps=1.543e+07u
-M1007 VGND A2 a_132_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_132_47# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=7.812e+11p ps=5.22e+06u
-M1009 VPWR A1 a_132_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A1 a_132_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_132_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_132_367# A2 a_49_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR A1 a_132_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_132_47# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y A3 a_49_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND A1 a_132_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A3 a_132_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_49_367# A3 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_132_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_49_367# A2 a_132_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VGND A3 a_132_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Y B1 a_132_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_132_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y B1 a_132_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_132_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_132_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_49_367# A3 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_132_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_132_367# A2 a_49_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_49_367# A2 a_132_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A3 a_132_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 Y A3 a_49_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VGND A3 a_132_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR A1 a_132_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND A2 a_132_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VGND A1 a_132_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_132_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VPWR A1 a_132_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_132_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_132_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_49_367# A2 a_132_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 Y B1 a_132_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VGND A2 a_132_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_132_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_132_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_49_367# A2 a_132_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_49_367# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 Y A3 a_49_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 a_132_367# A2 a_49_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 a_132_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_132_367# A2 a_49_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 a_49_367# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 a_132_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 a_132_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 VGND A1 a_132_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 Y B1 a_132_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X30 a_132_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X31 a_132_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.cdl b/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.cdl
index 82ced5f..049947d 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.cdl
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__o31ai_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPA2 sndA2 A3 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
+MMPB0 VPWR B1 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
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 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.42 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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o31ai_lp
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.netlist.tsv b/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.netlist.tsv
index ff5da38..4bff40c 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.netlist.tsv
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__o31ai_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.spice b/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.spice
index 228968f..2a25884 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.spice
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__o31ai_lp A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 a_161_57# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=3.381e+11p ps=3.29e+06u
-M1001 VGND A2 a_161_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_161_57# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_137_419# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=5.7e+11p ps=5.14e+06u
-M1004 Y A3 a_235_419# VPB phighvt w=1e+06u l=250000u
-+  ad=3.2e+11p pd=2.64e+06u as=3.2e+11p ps=2.64e+06u
-M1005 VPWR B1 Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_235_419# A2 a_137_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B1 a_161_57# VNB nshort w=420000u l=150000u
-+  ad=1.533e+11p pd=1.57e+06u as=0p ps=0u
+X0 VPWR A1 a_137_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_137_419# A2 a_235_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_235_419# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 VGND A1 a_161_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND A3 a_161_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_161_57# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_161_57# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_m.cdl b/cells/o31ai/sky130_fd_sc_lp__o31ai_m.cdl
index 0a70ffe..0c69703 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_m.cdl
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_m.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__o31ai_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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.42 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.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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.42 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.42 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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o31ai_m
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_m.netlist.tsv b/cells/o31ai/sky130_fd_sc_lp__o31ai_m.netlist.tsv
index 8b497e4..700e41f 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_m.netlist.tsv
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_m.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__o31ai_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_m.spice b/cells/o31ai/sky130_fd_sc_lp__o31ai_m.spice
index 2d71a30..2fcb20f 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_m.spice
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_m.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__o31ai_m A1 A2 A3 B1 VGND VNB VPB VPWR Y
-M1000 a_226_535# A2 a_154_535# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=8.82e+10p ps=1.26e+06u
-M1001 Y A3 a_226_535# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1002 a_154_535# A1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.74e+06u
-M1003 a_126_129# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=2.289e+11p ps=2.77e+06u
-M1004 Y B1 a_126_129# VNB nshort w=420000u l=150000u
-+  ad=1.449e+11p pd=1.53e+06u as=0p ps=0u
-M1005 VGND A2 a_126_129# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR B1 Y VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_126_129# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_154_535# A2 a_226_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_226_535# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VGND A1 a_126_129# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND A3 a_126_129# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_126_129# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_126_129# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR A1 a_154_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_0.cdl b/cells/o32a/sky130_fd_sc_lp__o32a_0.cdl
index 1b7ede4..6d71e6a 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_0.cdl
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_0.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__o32a_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPA2 sndA2 A3 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
+MMPB0 VPWR B1 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
+MMPB1 sndB1 B2 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
+MMIPX X y 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 y B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o32a_0
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_0.netlist.tsv b/cells/o32a/sky130_fd_sc_lp__o32a_0.netlist.tsv
index 43a1fff..d1680f1 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_0.netlist.tsv
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_0.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__o32a_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o32a/sky130_fd_sc_lp__o32a_0.spice b/cells/o32a/sky130_fd_sc_lp__o32a_0.spice
index c1e74aa..faa791c 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_0.spice
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_0.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o32a_0 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 VGND a_97_309# X VNB nshort w=420000u l=150000u
-+  ad=3.864e+11p pd=3.52e+06u as=1.113e+11p ps=1.37e+06u
-M1001 a_271_85# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=3.57e+11p pd=4.22e+06u as=0p ps=0u
-M1002 a_97_309# A3 a_379_481# VPB phighvt w=640000u l=150000u
-+  ad=2.304e+11p pd=2e+06u as=1.536e+11p ps=1.76e+06u
-M1003 a_301_481# A1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=5.152e+11p ps=4.17e+06u
-M1004 a_559_481# B2 a_97_309# VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1005 a_271_85# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_271_85# B1 a_97_309# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.47e+11p ps=1.54e+06u
-M1007 a_97_309# B2 a_271_85# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B1 a_559_481# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_379_481# A2 a_301_481# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A2 a_271_85# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_97_309# X VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
+X0 X a_97_309# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND A1 a_271_85# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 X a_97_309# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_97_309# B1 a_271_85# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_559_481# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_379_481# A3 a_97_309# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 a_271_85# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR A1 a_301_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 VGND A3 a_271_85# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_271_85# B2 a_97_309# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_97_309# B2 a_559_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 a_301_481# A2 a_379_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_1.cdl b/cells/o32a/sky130_fd_sc_lp__o32a_1.cdl
index ed4f538..c4665f1 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_1.cdl
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 y B2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 y B2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o32a_1
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_1.netlist.tsv b/cells/o32a/sky130_fd_sc_lp__o32a_1.netlist.tsv
index 5838e7f..81a942f 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_1.netlist.tsv
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_1.spice b/cells/o32a/sky130_fd_sc_lp__o32a_1.spice
index db4110b..4fed034 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_1.spice
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o32a_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 a_88_269# B2 a_250_69# VNB nshort w=840000u l=150000u
-+  ad=2.94e+11p pd=2.38e+06u as=7.308e+11p ps=6.78e+06u
-M1001 VGND A2 a_250_69# VNB nshort w=840000u l=150000u
-+  ad=7.98e+11p pd=5.26e+06u as=0p ps=0u
-M1002 a_604_367# B2 a_88_269# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=7.812e+11p ps=3.76e+06u
-M1003 a_250_69# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND a_88_269# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.25e+06u
-M1005 VPWR B1 a_604_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=8.442e+11p pd=6.38e+06u as=0p ps=0u
-M1006 a_250_69# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_88_269# A3 a_358_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.906e+11p ps=3.14e+06u
-M1008 a_358_367# A2 a_264_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=4.032e+11p ps=3.16e+06u
-M1009 VPWR a_88_269# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.591e+11p ps=3.09e+06u
-M1010 a_264_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_250_69# B1 a_88_269# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_88_269# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_88_269# B1 a_250_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR A1 a_264_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND A3 a_250_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_250_69# B2 a_88_269# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND A1 a_250_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_358_367# A3 a_88_269# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 X a_88_269# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_264_367# A2 a_358_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_250_69# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_88_269# B2 a_604_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_604_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_2.cdl b/cells/o32a/sky130_fd_sc_lp__o32a_2.cdl
index f34351d..d0057c8 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_2.cdl
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 y B2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB1 y B2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 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_lp__o32a_2
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_2.netlist.tsv b/cells/o32a/sky130_fd_sc_lp__o32a_2.netlist.tsv
index c545711..e8ccfe9 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_2.netlist.tsv
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_2.spice b/cells/o32a/sky130_fd_sc_lp__o32a_2.spice
index 3a628d1..f214ecc 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_2.spice
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__o32a_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 a_355_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=1.449e+12p ps=9.86e+06u
-M1001 a_341_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=7.224e+11p pd=6.76e+06u as=1.1634e+12p ps=7.81e+06u
-M1002 VPWR B1 a_643_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=4.914e+11p ps=3.3e+06u
-M1003 a_341_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A2 a_341_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_85_21# A3 a_427_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.914e+11p pd=3.3e+06u as=4.914e+11p ps=3.3e+06u
-M1006 X a_85_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1007 a_341_47# B1 a_85_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.688e+11p ps=2.32e+06u
-M1008 a_427_367# A2 a_355_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_85_21# B2 a_341_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_643_367# B2 a_85_21# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_85_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1012 VPWR a_85_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_85_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_355_367# A2 a_427_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 X a_85_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_85_21# B1 a_341_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_643_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_341_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_85_21# B2 a_643_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND A3 a_341_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_427_367# A3 a_85_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR A1 a_355_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VGND A1 a_341_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VPWR a_85_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_341_47# B2 a_85_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 X a_85_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 VGND a_85_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_4.cdl b/cells/o32a/sky130_fd_sc_lp__o32a_4.cdl
index 8308034..e6afad4 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_4.cdl
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 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
-MMPA2 sndA2 A3 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 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
-MMPB1 sndB1 B2 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 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 phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 y B2 VNB nfet_01v8 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=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
-MMNA1 pndA A2 VNB nshort 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
-MMNA2 pndA A3 VNB nshort 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
-MMNB0 y B1 VNB nshort 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
-MMNB1 y B2 VNB nshort 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
-MMINX X y VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=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_lp__o32a_4
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_4.netlist.tsv b/cells/o32a/sky130_fd_sc_lp__o32a_4.netlist.tsv
index 4852b95..9712a40 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_4.netlist.tsv
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_4.spice b/cells/o32a/sky130_fd_sc_lp__o32a_4.spice
index ed42315..c8014c0 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_4.spice
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_lp__o32a_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 X a_547_367# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=1.6884e+12p ps=1.41e+07u
-M1001 a_823_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.119e+11p pd=6.17e+06u as=1.7262e+12p ps=1.534e+07u
-M1002 VPWR A1 a_195_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.56e+11p ps=6.24e+06u
-M1003 a_44_65# B2 a_547_367# VNB nshort w=840000u l=150000u
-+  ad=1.848e+12p pd=1.448e+07u as=5.334e+11p ps=4.63e+06u
-M1004 VPWR a_547_367# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1005 a_547_367# A3 a_112_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0206e+12p pd=9.18e+06u as=1.0206e+12p ps=9.18e+06u
-M1006 VGND A1 a_44_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_547_367# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_547_367# B1 a_44_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_547_367# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR B1 a_823_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_547_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A2 a_44_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_195_367# A2 a_112_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_547_367# B2 a_823_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_112_367# A2 a_195_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_547_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A3 a_44_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_44_65# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_44_65# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_547_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_44_65# B1 a_547_367# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_44_65# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_547_367# B2 a_44_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_195_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_112_367# A3 a_547_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_823_367# B2 a_547_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_547_367# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_823_367# B2 a_547_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 X a_547_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VGND A2 a_44_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VPWR B1 a_823_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_547_367# B2 a_44_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_823_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_112_367# A2 a_195_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 X a_547_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR a_547_367# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_112_367# A3 a_547_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_195_367# A2 a_112_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VGND a_547_367# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VPWR A1 a_195_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 X a_547_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_195_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_547_367# B1 a_44_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 VGND a_547_367# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_44_65# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 VGND A3 a_44_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 a_547_367# A3 a_112_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 VGND A1 a_44_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 a_44_65# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 a_44_65# B1 a_547_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 X a_547_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 a_547_367# B2 a_823_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 VPWR a_547_367# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 a_44_65# B2 a_547_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 a_44_65# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_lp.cdl b/cells/o32a/sky130_fd_sc_lp__o32a_lp.cdl
index 6940c0b..9567f4c 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_lp.cdl
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_lp.cdl
@@ -16,30 +16,30 @@
 
 .SUBCKT sky130_fd_sc_lp__o32a_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPA2 sndA2 A3 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
+MMPB0 VPWR B1 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
+MMPB1 sndB1 B2 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
+MMIPX X y 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 y B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=1 w=0.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net63 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net63 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o32a_lp
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_lp.netlist.tsv b/cells/o32a/sky130_fd_sc_lp__o32a_lp.netlist.tsv
index ed7a66f..b92e267 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_lp.netlist.tsv
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_lp.netlist.tsv
@@ -1,15 +1,15 @@
 sky130_fd_sc_lp__o32a_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	net63	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net63	y	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	net63	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net63	y	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/o32a/sky130_fd_sc_lp__o32a_lp.spice b/cells/o32a/sky130_fd_sc_lp__o32a_lp.spice
index 3cdf308..2ba51fa 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_lp.spice
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_lp.spice
@@ -16,30 +16,17 @@
 
 
 .subckt sky130_fd_sc_lp__o32a_lp A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 a_134_101# B1 a_31_101# VNB nshort w=420000u l=150000u
-+  ad=1.617e+11p pd=1.68e+06u as=3.885e+11p ps=4.37e+06u
-M1001 a_31_101# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.9085e+11p ps=3.73e+06u
-M1002 VPWR A1 a_474_419# VPB phighvt w=1e+06u l=250000u
-+  ad=5.9e+11p pd=5.18e+06u as=2.4e+11p ps=2.48e+06u
-M1003 VGND A1 a_31_101# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_376_419# A3 a_134_101# VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=3.85e+11p ps=2.77e+06u
-M1005 a_151_419# B1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1006 X a_134_101# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1007 a_134_101# B2 a_151_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_612_89# a_134_101# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1009 a_31_101# B2 a_134_101# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A3 a_31_101# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_134_101# a_612_89# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1012 a_474_419# A2 a_376_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_31_101# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_134_101# A3 a_376_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_151_419# B2 a_134_101# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_376_419# A2 a_474_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 VPWR a_134_101# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_31_101# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_134_101# a_612_89# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_474_419# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 VGND A2 a_31_101# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_31_101# B1 a_134_101# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_134_101# B2 a_31_101# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR B1 a_151_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 a_612_89# a_134_101# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_m.cdl b/cells/o32a/sky130_fd_sc_lp__o32a_m.cdl
index 5318e51..ad74d4f 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_m.cdl
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_m.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__o32a_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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.42 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=0.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 y B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o32a_m
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_m.netlist.tsv b/cells/o32a/sky130_fd_sc_lp__o32a_m.netlist.tsv
index aa8515c..5f17b7b 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_m.netlist.tsv
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_m.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__o32a_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	y	B2	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	y	B2	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o32a/sky130_fd_sc_lp__o32a_m.spice b/cells/o32a/sky130_fd_sc_lp__o32a_m.spice
index c2e795b..0169dcb 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_m.spice
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_m.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o32a_m A1 A2 A3 B1 B2 VGND VNB VPB VPWR X
-M1000 a_249_403# A1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.36e+11p ps=3.28e+06u
-M1001 a_86_55# A3 a_321_403# VPB phighvt w=420000u l=150000u
-+  ad=2.247e+11p pd=1.91e+06u as=1.638e+11p ps=1.62e+06u
-M1002 VGND A2 a_249_81# VNB nshort w=420000u l=150000u
-+  ad=4.263e+11p pd=3.71e+06u as=3.633e+11p ps=4.25e+06u
-M1003 VPWR B1 a_566_403# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.029e+11p ps=1.33e+06u
-M1004 a_249_81# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_86_55# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 a_321_403# A2 a_249_403# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_249_81# B1 a_86_55# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1008 a_86_55# B2 a_249_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_249_81# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_566_403# B2 a_86_55# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_86_55# X VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 a_321_403# A3 a_86_55# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_566_403# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_249_403# A2 a_321_403# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_86_55# B1 a_249_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 X a_86_55# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_86_55# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VGND A1 a_249_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR A1 a_249_403# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_249_81# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_86_55# B2 a_566_403# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 VGND A3 a_249_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_249_81# B2 a_86_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_0.cdl b/cells/o32ai/sky130_fd_sc_lp__o32ai_0.cdl
index 3b5062b..abb8156 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_0.cdl
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o32ai_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPA2 sndA2 A3 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
+MMPB0 VPWR B1 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
+MMPB1 sndB1 B2 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
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o32ai_0
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_0.netlist.tsv b/cells/o32ai/sky130_fd_sc_lp__o32ai_0.netlist.tsv
index 8a5dbb5..807fc15 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_0.netlist.tsv
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o32ai_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_0.spice b/cells/o32ai/sky130_fd_sc_lp__o32ai_0.spice
index f4e3568..673adcc 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_0.spice
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o32ai_0 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 a_33_82# B2 Y VNB nshort w=420000u l=150000u
-+  ad=3.465e+11p pd=4.17e+06u as=1.47e+11p ps=1.54e+06u
-M1001 VGND A1 a_33_82# VNB nshort w=420000u l=150000u
-+  ad=3.948e+11p pd=3.56e+06u as=0p ps=0u
-M1002 VGND A3 a_33_82# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 Y B1 a_33_82# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_325_491# A3 Y VPB phighvt w=640000u l=150000u
-+  ad=2.688e+11p pd=2.12e+06u as=2.688e+11p ps=2.12e+06u
-M1005 a_33_82# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_133_491# B1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=3.424e+11p ps=3.63e+06u
-M1007 Y B2 a_133_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_439_491# A2 a_325_491# VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1009 VPWR A1 a_439_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_33_82# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 Y B2 a_33_82# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_33_82# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 Y A3 a_325_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 VGND A2 a_33_82# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_33_82# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_325_491# A2 a_439_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 VPWR B1 a_133_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 a_439_491# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 a_133_491# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_1.cdl b/cells/o32ai/sky130_fd_sc_lp__o32ai_1.cdl
index 1fdf683..a9c6a7f 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_1.cdl
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=1 w=1.26 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.84 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.84 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.84 l=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o32ai_1
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_1.netlist.tsv b/cells/o32ai/sky130_fd_sc_lp__o32ai_1.netlist.tsv
index 3d38c99..1ac3aef 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_1.netlist.tsv
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_1.spice b/cells/o32ai/sky130_fd_sc_lp__o32ai_1.spice
index 065c0b0..0a5d506 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_1.spice
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o32ai_1 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 VPWR A1 a_489_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.678e+11p pd=6.1e+06u as=3.78e+11p ps=3.12e+06u
-M1001 a_76_69# B2 Y VNB nshort w=840000u l=150000u
-+  ad=7.098e+11p pd=6.73e+06u as=2.772e+11p ps=2.34e+06u
-M1002 VGND A1 a_76_69# VNB nshort w=840000u l=150000u
-+  ad=7.434e+11p pd=5.13e+06u as=0p ps=0u
-M1003 VGND A3 a_76_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_159_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1005 Y B2 a_159_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=8.694e+11p pd=3.9e+06u as=0p ps=0u
-M1006 a_399_367# A3 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.78e+11p pd=3.12e+06u as=0p ps=0u
-M1007 a_76_69# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_489_367# A2 a_399_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B1 a_76_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B2 a_76_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_76_69# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR B1 a_159_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_399_367# A2 a_489_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND A2 a_76_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_76_69# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_159_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_489_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 Y A3 a_399_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_76_69# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_2.cdl b/cells/o32ai/sky130_fd_sc_lp__o32ai_2.cdl
index 1461335..a2065d1 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_2.cdl
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 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
-MMPA2 sndA2 A3 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 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
-MMPB1 sndB1 B2 VPB phighvt m=2 w=1.26 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.84 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.84 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.84 l=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 VNB nfet_01v8 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_lp__o32ai_2
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_2.netlist.tsv b/cells/o32ai/sky130_fd_sc_lp__o32ai_2.netlist.tsv
index 1106c72..68310c7 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_2.netlist.tsv
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_2.spice b/cells/o32ai/sky130_fd_sc_lp__o32ai_2.spice
index f726f7d..89a1330 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_2.spice
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__o32ai_2 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 VPWR A1 a_778_365# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0206e+12p pd=9.18e+06u as=7.056e+11p ps=6.16e+06u
-M1001 VGND A1 a_39_65# VNB nshort w=840000u l=150000u
-+  ad=1.176e+12p pd=7.84e+06u as=1.5288e+12p ps=1.372e+07u
-M1002 VGND A2 a_39_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_778_365# A2 a_519_365# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.0458e+12p ps=9.22e+06u
-M1004 a_39_65# B2 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=5.376e+11p ps=4.64e+06u
-M1005 a_39_367# B2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0206e+12p pd=9.18e+06u as=7.056e+11p ps=6.16e+06u
-M1006 Y B1 a_39_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_39_65# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_39_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_778_365# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_39_65# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_519_365# A3 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_39_65# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_39_65# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_519_365# A2 a_778_365# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Y B2 a_39_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR B1 a_39_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 Y A3 a_519_365# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A3 a_39_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Y B2 a_39_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_778_365# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 Y B2 a_39_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VGND A1 a_39_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_39_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND A2 a_39_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_519_365# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_39_65# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_39_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_39_65# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_519_365# A2 a_778_365# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 Y B1 a_39_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VGND A3 a_39_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 Y A3 a_519_365# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 Y B2 a_39_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_39_65# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VPWR B1 a_39_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_778_365# A2 a_519_365# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 VPWR A1 a_778_365# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 a_39_65# B2 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 a_39_65# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_4.cdl b/cells/o32ai/sky130_fd_sc_lp__o32ai_4.cdl
index 1361d4d..deb51b5 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_4.cdl
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=4 w=0.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=4 w=0.84 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.26 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.84 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.84 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.84 l=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.84 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 VNB nfet_01v8 m=4 w=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_lp__o32ai_4
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_4.netlist.tsv b/cells/o32ai/sky130_fd_sc_lp__o32ai_4.netlist.tsv
index 8a43fe6..a5d222e 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_4.netlist.tsv
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_4.spice b/cells/o32ai/sky130_fd_sc_lp__o32ai_4.spice
index 4b5635b..e2201db 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_4.spice
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__o32ai_4 A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 VPWR A1 a_1256_349# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7262e+12p pd=1.534e+07u as=1.4112e+12p ps=1.232e+07u
-M1001 Y B1 a_30_47# VNB nshort w=840000u l=150000u
-+  ad=9.408e+11p pd=8.96e+06u as=3.1416e+12p ps=2.596e+07u
-M1002 Y A3 a_829_349# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=1.7262e+12p ps=1.534e+07u
-M1003 Y B2 a_30_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A2 a_30_47# VNB nshort w=840000u l=150000u
-+  ad=1.7808e+12p pd=1.432e+07u as=0p ps=0u
-M1005 a_829_349# A2 a_1256_349# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_30_367# B2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7703e+12p pd=1.541e+07u as=0p ps=0u
-M1007 a_30_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Y A3 a_829_349# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A3 a_30_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_30_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_30_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A1 a_1256_349# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR B1 a_30_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_30_367# B2 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_30_47# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1256_349# A2 a_829_349# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1256_349# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_30_47# B2 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_30_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y B2 a_30_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_30_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1256_349# A2 a_829_349# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR B1 a_30_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Y B1 a_30_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Y B2 a_30_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1256_349# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_30_47# B2 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 Y B2 a_30_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_30_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_829_349# A3 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A3 a_30_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND A2 a_30_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_829_349# A3 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_30_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND A1 a_30_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND A1 a_30_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_30_367# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_829_349# A2 a_1256_349# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_30_47# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B2 a_30_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND A2 a_30_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR A1 a_1256_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_30_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_1256_349# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 Y B1 a_30_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_30_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_30_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_30_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_1256_349# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_829_349# A2 a_1256_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_30_47# B2 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 Y B1 a_30_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 Y B2 a_30_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_829_349# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VGND A3 a_30_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 Y A3 a_829_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_30_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_30_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 a_829_349# A3 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 VGND A2 a_30_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 VGND A1 a_30_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 VPWR B1 a_30_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 VGND A3 a_30_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 a_30_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 a_30_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 a_30_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 a_1256_349# A2 a_829_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 a_30_367# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 Y A3 a_829_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 a_829_349# A2 a_1256_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 a_30_367# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X32 a_30_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X33 VPWR B1 a_30_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X34 VGND A1 a_30_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X35 VPWR A1 a_1256_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X36 Y B2 a_30_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X37 a_1256_349# A2 a_829_349# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X38 Y B2 a_30_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X39 a_30_47# B2 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.cdl b/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.cdl
index 8310fc4..aa2dc55 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.cdl
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o32ai_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPA2 sndA2 A3 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
+MMPB0 VPWR B1 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
+MMPB1 sndB1 B2 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
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 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
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o32ai_lp
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.netlist.tsv b/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.netlist.tsv
index 972fb66..794638c 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.netlist.tsv
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o32ai_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.spice b/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.spice
index fe561bd..d78e7b1 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.spice
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o32ai_lp A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 Y B2 a_134_419# VPB phighvt w=1e+06u l=250000u
-+  ad=2.8e+11p pd=2.56e+06u as=2.4e+11p ps=2.48e+06u
-M1001 VPWR A1 a_463_419# VPB phighvt w=1e+06u l=250000u
-+  ad=5.7e+11p pd=5.14e+06u as=3.2e+11p ps=2.64e+06u
-M1002 a_338_419# A3 Y VPB phighvt w=1e+06u l=250000u
-+  ad=3.75e+11p pd=2.75e+06u as=0p ps=0u
-M1003 a_27_179# B2 Y VNB nshort w=420000u l=150000u
-+  ad=4.934e+11p pd=4.95e+06u as=1.176e+11p ps=1.4e+06u
-M1004 a_463_419# A2 a_338_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A3 a_27_179# VNB nshort w=420000u l=150000u
-+  ad=4.095e+11p pd=3.63e+06u as=0p ps=0u
-M1006 a_27_179# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A1 a_27_179# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_134_419# B1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y B1 a_27_179# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B1 a_134_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_134_419# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_27_179# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_338_419# A2 a_463_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_27_179# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 Y A3 a_338_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_463_419# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 Y B2 a_27_179# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_27_179# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND A2 a_27_179# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_m.cdl b/cells/o32ai/sky130_fd_sc_lp__o32ai_m.cdl
index 9599e4b..fe0d2f5 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_m.cdl
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o32ai_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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.42 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=0.42 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.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB1 sndB1 B2 VPB phighvt m=1 w=0.42 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.42 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.42 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.42 l=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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB1 Y B2 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o32ai_m
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_m.netlist.tsv b/cells/o32ai/sky130_fd_sc_lp__o32ai_m.netlist.tsv
index 09da9d0..09687b9 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_m.netlist.tsv
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o32ai_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	sndB1	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB1	MOSFET	sndB1	B2	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB1	MOSFET	Y	B2	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	Y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	sndB1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB1	MOSFET	sndB1	B2	Y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB1	MOSFET	Y	B2	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_m.spice b/cells/o32ai/sky130_fd_sc_lp__o32ai_m.spice
index ddf9eef..ac55064 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_m.spice
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o32ai_m A1 A2 A3 B1 B2 VGND VNB VPB VPWR Y
-M1000 Y B2 a_179_535# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=8.82e+10p ps=1.26e+06u
-M1001 a_179_535# B1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=4.62e+11p ps=3.88e+06u
-M1002 VPWR A1 a_431_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1003 a_66_82# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=3.801e+11p pd=4.33e+06u as=2.457e+11p ps=2.85e+06u
-M1004 VGND A1 a_66_82# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_431_535# A2 a_337_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1006 VGND A3 a_66_82# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B1 a_66_82# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1008 a_337_535# A3 Y VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_66_82# B2 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A2 a_66_82# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_66_82# B1 Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 Y B2 a_66_82# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_431_535# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_66_82# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR B1 a_179_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_66_82# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_337_535# A2 a_431_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 Y A3 a_337_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_179_535# B2 Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_0.cdl b/cells/o41a/sky130_fd_sc_lp__o41a_0.cdl
index eef37b8..3f61348 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_0.cdl
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_0.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__o41a_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPA2 sndA2 A3 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
+MMPA3 sndA3 A4 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
+MMPB0 VPWR B1 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
+MMIPX X y 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA3 pndA A4 VNB nfet_01v8 m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 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.42 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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o41a_0
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_0.netlist.tsv b/cells/o41a/sky130_fd_sc_lp__o41a_0.netlist.tsv
index e43ce43..3925da9 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_0.netlist.tsv
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_0.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__o41a_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	sndA3	A4	y	VPB	pfet_01v8_hvt	1	0.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o41a/sky130_fd_sc_lp__o41a_0.spice b/cells/o41a/sky130_fd_sc_lp__o41a_0.spice
index 1a93f7d..26fc366 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_0.spice
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_0.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o41a_0 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 a_319_51# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=3.465e+11p pd=4.17e+06u as=3.717e+11p ps=4.29e+06u
-M1001 VPWR A1 a_603_483# VPB phighvt w=640000u l=150000u
-+  ad=3.488e+11p pd=3.65e+06u as=1.344e+11p ps=1.7e+06u
-M1002 a_319_51# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND a_80_21# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 VGND A2 a_319_51# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_80_21# B1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=5.12e+11p pd=2.88e+06u as=0p ps=0u
-M1006 a_423_483# A4 a_80_21# VPB phighvt w=640000u l=150000u
-+  ad=1.92e+11p pd=1.88e+06u as=0p ps=0u
-M1007 a_319_51# B1 a_80_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1008 a_513_483# A3 a_423_483# VPB phighvt w=640000u l=150000u
-+  ad=1.92e+11p pd=1.88e+06u as=0p ps=0u
-M1009 VGND A4 a_319_51# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_80_21# X VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1011 a_603_483# A2 a_513_483# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_319_51# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_513_483# A2 a_603_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_603_483# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_80_21# B1 a_319_51# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_319_51# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_80_21# A4 a_423_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_423_483# A3 a_513_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 VGND A1 a_319_51# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X10 VPWR B1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 VGND A3 a_319_51# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_1.cdl b/cells/o41a/sky130_fd_sc_lp__o41a_1.cdl
index cf4f303..278b7db 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_1.cdl
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA3 sndA3 A4 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA3 pndA A4 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA3 pndA A4 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o41a_1
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_1.netlist.tsv b/cells/o41a/sky130_fd_sc_lp__o41a_1.netlist.tsv
index aca8f22..9e78cff 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_1.netlist.tsv
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_1.spice b/cells/o41a/sky130_fd_sc_lp__o41a_1.spice
index cb876af..1391611 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_1.spice
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o41a_1 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 a_447_367# A4 a_155_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=6.048e+11p pd=3.48e+06u as=5.103e+11p ps=3.33e+06u
-M1001 VGND a_155_23# X VNB nshort w=840000u l=150000u
-+  ad=9.114e+11p pd=7.21e+06u as=5.082e+11p ps=2.89e+06u
-M1002 a_375_49# B1 a_155_23# VNB nshort w=840000u l=150000u
-+  ad=6.93e+11p pd=6.69e+06u as=2.226e+11p ps=2.21e+06u
-M1003 VPWR A1 a_663_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=8.631e+11p pd=6.41e+06u as=4.914e+11p ps=3.3e+06u
-M1004 a_375_49# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND A4 a_375_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_573_367# A3 a_447_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.78e+11p pd=3.12e+06u as=0p ps=0u
-M1007 VGND A2 a_375_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_155_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.623e+11p ps=3.73e+06u
-M1009 a_663_367# A2 a_573_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_155_23# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_375_49# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B1 a_155_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_155_23# A4 a_447_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 X a_155_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 X a_155_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_447_367# A3 a_573_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND A3 a_375_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_375_49# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VGND A1 a_375_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_663_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_155_23# B1 a_375_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_375_49# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_573_367# A2 a_663_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_2.cdl b/cells/o41a/sky130_fd_sc_lp__o41a_2.cdl
index eee0cb2..ab2f29e 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_2.cdl
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA3 sndA3 A4 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA3 pndA A4 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIPX X y VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA3 pndA A4 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNB0 y B1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 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_lp__o41a_2
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_2.netlist.tsv b/cells/o41a/sky130_fd_sc_lp__o41a_2.netlist.tsv
index 9d5a944..b562ab0 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_2.netlist.tsv
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_2.spice b/cells/o41a/sky130_fd_sc_lp__o41a_2.spice
index 9be461d..d3db052 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_2.spice
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__o41a_2 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 VGND a_102_53# X VNB nshort w=840000u l=150000u
-+  ad=1.0962e+12p pd=9.33e+06u as=2.352e+11p ps=2.24e+06u
-M1001 a_753_367# A2 a_645_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.914e+11p pd=3.3e+06u as=4.914e+11p ps=3.3e+06u
-M1002 a_465_49# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=7.308e+11p pd=6.78e+06u as=0p ps=0u
-M1003 VPWR a_102_53# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7514e+12p pd=1.034e+07u as=3.528e+11p ps=3.08e+06u
-M1004 a_465_49# B1 a_102_53# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1005 VPWR A1 a_753_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_465_49# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_102_53# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.812e+11p pd=3.76e+06u as=0p ps=0u
-M1008 a_573_367# A4 a_102_53# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1009 a_645_367# A3 a_573_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A4 a_465_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_102_53# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A2 a_465_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_102_53# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_102_53# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_753_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VGND a_102_53# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_645_367# A2 a_753_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR B1 a_102_53# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VPWR a_102_53# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND A3 a_465_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_102_53# A4 a_573_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_573_367# A3 a_645_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_465_49# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VGND A1 a_465_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_102_53# B1 a_465_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_465_49# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 X a_102_53# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_4.cdl b/cells/o41a/sky130_fd_sc_lp__o41a_4.cdl
index 35b7476..daa120f 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_4.cdl
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 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
-MMPA2 sndA2 A3 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 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
-MMPA3 sndA3 A4 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA3 pndA A4 VNB nfet_01v8 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 phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 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=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
-MMNA1 pndA A2 VNB nshort 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
-MMNA2 pndA A3 VNB nshort 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
-MMNA3 pndA A4 VNB nshort 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
-MMNB0 y B1 VNB nshort 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
-MMINX X y VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=4 w=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_lp__o41a_4
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_4.netlist.tsv b/cells/o41a/sky130_fd_sc_lp__o41a_4.netlist.tsv
index 152ead2..1fbd13b 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_4.netlist.tsv
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_4.spice b/cells/o41a/sky130_fd_sc_lp__o41a_4.spice
index 3a1a6d0..aee1bf5 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_4.spice
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_lp__o41a_4 A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 X a_83_23# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=2.0328e+12p ps=1.66e+07u
-M1001 a_480_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=1.4028e+12p pd=1.342e+07u as=0p ps=0u
-M1002 a_83_23# A4 a_652_345# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=1.071e+12p ps=9.26e+06u
-M1003 a_480_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_83_23# B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.7262e+12p ps=1.534e+07u
-M1005 VPWR A1 a_1108_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.0206e+12p ps=9.18e+06u
-M1006 VPWR a_83_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1007 VGND A2 a_480_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_652_345# A4 a_83_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_83_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND a_83_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_83_23# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A3 a_480_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_480_47# B1 a_83_23# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1014 a_652_345# A3 a_907_345# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1015 a_1108_367# A2 a_907_345# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND a_83_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR B1 a_83_23# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A1 a_480_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_83_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 X a_83_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_907_345# A2 a_1108_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1108_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_480_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND A4 a_480_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_480_47# A4 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_83_23# B1 a_480_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_907_345# A3 a_652_345# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_480_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND A3 a_480_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_83_23# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VPWR A1 a_1108_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_1108_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_83_23# B1 a_480_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VGND A2 a_480_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_480_47# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND a_83_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 X a_83_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR a_83_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_480_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VGND A1 a_480_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VPWR a_83_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_652_345# A3 a_907_345# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_83_23# A4 a_652_345# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 VGND A4 a_480_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 X a_83_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VPWR B1 a_83_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_907_345# A3 a_652_345# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 X a_83_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 a_652_345# A4 a_83_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 a_907_345# A2 a_1108_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 VGND a_83_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 a_480_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 a_1108_367# A2 a_907_345# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 X a_83_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 a_480_47# B1 a_83_23# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_lp.cdl b/cells/o41a/sky130_fd_sc_lp__o41a_lp.cdl
index 5a34135..7c9f0be 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_lp.cdl
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_lp.cdl
@@ -16,30 +16,30 @@
 
 .SUBCKT sky130_fd_sc_lp__o41a_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPA2 sndA2 A3 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
+MMPA3 sndA3 A4 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
+MMPB0 VPWR B1 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
+MMIPX X y 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
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA3 pndA A4 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA1 pndA A2 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA2 pndA A3 VNB nshort m=1 w=0.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net71 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net71 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o41a_lp
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_lp.netlist.tsv b/cells/o41a/sky130_fd_sc_lp__o41a_lp.netlist.tsv
index 24e9cde..5cbcf4f 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_lp.netlist.tsv
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_lp.netlist.tsv
@@ -1,15 +1,15 @@
 sky130_fd_sc_lp__o41a_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	net71	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net71	y	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	sndA3	A4	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	net71	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net71	y	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/o41a/sky130_fd_sc_lp__o41a_lp.spice b/cells/o41a/sky130_fd_sc_lp__o41a_lp.spice
index 2d1f746..224dd69 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_lp.spice
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_lp.spice
@@ -16,30 +16,17 @@
 
 
 .subckt sky130_fd_sc_lp__o41a_lp A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 VGND A3 a_31_57# VNB nshort w=420000u l=150000u
-+  ad=4.41e+11p pd=4.62e+06u as=3.696e+11p ps=4.28e+06u
-M1001 X a_457_412# a_708_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1002 VGND A1 a_31_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_31_57# A2 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_457_412# A4 a_349_412# VPB phighvt w=1e+06u l=250000u
-+  ad=5.65e+11p pd=3.13e+06u as=2.9e+11p ps=2.58e+06u
-M1005 X a_457_412# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=6.8e+11p ps=5.36e+06u
-M1006 a_708_47# a_457_412# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_349_412# A3 a_235_412# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=3.2e+11p ps=2.64e+06u
-M1008 a_137_412# A1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1009 a_31_57# A4 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_235_412# A2 a_137_412# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_457_412# B1 a_31_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1012 VPWR B1 a_457_412# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_349_412# A4 a_457_412# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 VGND A2 a_31_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_457_412# B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 VGND a_457_412# a_708_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR A1 a_137_412# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_137_412# A2 a_235_412# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 VPWR a_457_412# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_31_57# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_235_412# A3 a_349_412# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_31_57# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_708_47# a_457_412# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND A4 a_31_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_31_57# B1 a_457_412# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_m.cdl b/cells/o41a/sky130_fd_sc_lp__o41a_m.cdl
index 01d0c22..3a65739 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_m.cdl
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_m.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__o41a_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA3 pndA A4 VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMNA0 pndA A1 VNB nshort m=1 w=0.42 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.42 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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMINX X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMINX X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o41a_m
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_m.netlist.tsv b/cells/o41a/sky130_fd_sc_lp__o41a_m.netlist.tsv
index 4b7689a..e6fdfdd 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_m.netlist.tsv
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_m.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__o41a_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIPX	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMINX	MOSFET	X	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	sndA3	A4	y	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIPX	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMINX	MOSFET	X	y	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/o41a/sky130_fd_sc_lp__o41a_m.spice b/cells/o41a/sky130_fd_sc_lp__o41a_m.spice
index 6fff5d5..5134683 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_m.spice
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_m.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__o41a_m A1 A2 A3 A4 B1 VGND VNB VPB VPWR X
-M1000 VGND A2 a_300_51# VNB nshort w=420000u l=150000u
-+  ad=3.465e+11p pd=4.17e+06u as=3.465e+11p ps=4.17e+06u
-M1001 VGND A4 a_300_51# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR a_80_21# X VPB phighvt w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=1.113e+11p ps=1.37e+06u
-M1003 a_329_535# A4 a_80_21# VPB phighvt w=420000u l=150000u
-+  ad=1.785e+11p pd=1.69e+06u as=1.281e+11p ps=1.45e+06u
-M1004 a_444_535# A3 a_329_535# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1005 a_300_51# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_80_21# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 a_80_21# B1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_300_51# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_300_51# B1 a_80_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1010 a_516_535# A2 a_444_535# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1011 VPWR A1 a_516_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_300_51# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_444_535# A2 a_516_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_516_535# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 X a_80_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND A3 a_300_51# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_80_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_300_51# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND A1 a_300_51# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR B1 a_80_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_80_21# A4 a_329_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_329_535# A3 a_444_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_80_21# B1 a_300_51# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_0.cdl b/cells/o41ai/sky130_fd_sc_lp__o41ai_0.cdl
index c89578b..acd7f35 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_0.cdl
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o41ai_0 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPA2 sndA2 A3 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
+MMPA3 sndA3 A4 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
+MMPB0 VPWR B1 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
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA3 pndA A4 VNB nfet_01v8 m=1 w=0.42 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.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.42 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.42 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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o41ai_0
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_0.netlist.tsv b/cells/o41ai/sky130_fd_sc_lp__o41ai_0.netlist.tsv
index d3b326f..64f81d6 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_0.netlist.tsv
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o41ai_0	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	sndA3	A4	Y	VPB	pfet_01v8_hvt	1	0.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_0.spice b/cells/o41ai/sky130_fd_sc_lp__o41ai_0.spice
index 1568859..d44926c 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_0.spice
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o41ai_0 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 Y B1 VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=3.392e+11p ps=3.62e+06u
-M1001 VGND A4 a_218_57# VNB nshort w=420000u l=150000u
-+  ad=2.982e+11p pd=3.1e+06u as=3.465e+11p ps=4.17e+06u
-M1002 a_218_57# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_394_483# A3 a_291_483# VPB phighvt w=640000u l=150000u
-+  ad=1.92e+11p pd=1.88e+06u as=2.336e+11p ps=2.01e+06u
-M1004 a_291_483# A4 Y VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_218_57# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_218_57# B1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.087e+11p ps=2.31e+06u
-M1007 a_484_483# A2 a_394_483# VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1008 VPWR A1 a_484_483# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A2 a_218_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_394_483# A2 a_484_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_484_483# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 VGND A1 a_218_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 Y A4 a_291_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 Y B1 a_218_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_218_57# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND A3 a_218_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_291_483# A3 a_394_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 a_218_57# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_1.cdl b/cells/o41ai/sky130_fd_sc_lp__o41ai_1.cdl
index 3ad4fbf..26a3d50 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_1.cdl
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA2 sndA2 A3 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA3 sndA3 A4 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA3 pndA A4 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPB0 VPWR B1 VPB phighvt m=1 w=1.26 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.84 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.84 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.84 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.84 l=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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o41ai_1
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_1.netlist.tsv b/cells/o41ai/sky130_fd_sc_lp__o41ai_1.netlist.tsv
index ebb33b3..6487715 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_1.netlist.tsv
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_1.spice b/cells/o41ai/sky130_fd_sc_lp__o41ai_1.spice
index d728a1c..d915909 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_1.spice
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o41ai_1 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 VGND A2 a_156_49# VNB nshort w=840000u l=150000u
-+  ad=5.964e+11p pd=4.78e+06u as=8.022e+11p ps=6.95e+06u
-M1001 a_156_49# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_444_367# A2 a_336_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.914e+11p pd=3.3e+06u as=4.914e+11p ps=3.3e+06u
-M1003 VGND A4 a_156_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_156_49# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1005 Y B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.914e+11p pd=3.3e+06u as=6.867e+11p ps=6.13e+06u
-M1006 a_156_49# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A1 a_444_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_264_367# A4 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1009 a_336_367# A3 a_264_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y A4 a_264_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_264_367# A3 a_336_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VGND A3 a_156_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_156_49# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND A1 a_156_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_156_49# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 Y B1 a_156_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_444_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_336_367# A2 a_444_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_2.cdl b/cells/o41ai/sky130_fd_sc_lp__o41ai_2.cdl
index 2de9f81..3408c6e 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_2.cdl
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 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
-MMPA2 sndA2 A3 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 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
-MMPA3 sndA3 A4 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA3 pndA A4 VNB nfet_01v8 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
-MMPB0 VPWR B1 VPB phighvt m=2 w=1.26 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.84 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.84 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.84 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.84 l=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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 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_lp__o41ai_2
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_2.netlist.tsv b/cells/o41ai/sky130_fd_sc_lp__o41ai_2.netlist.tsv
index f4aaf25..6837840 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_2.netlist.tsv
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	2	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_2.spice b/cells/o41ai/sky130_fd_sc_lp__o41ai_2.spice
index 310e924..f57ddac 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_2.spice
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__o41ai_2 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 a_808_367# A2 a_615_365# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0206e+12p pd=9.18e+06u as=7.056e+11p ps=6.16e+06u
-M1001 VGND A3 a_155_47# VNB nshort w=840000u l=150000u
-+  ad=1.1298e+12p pd=9.41e+06u as=1.4028e+12p ps=1.342e+07u
-M1002 a_313_365# A4 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.3167e+12p pd=9.65e+06u as=7.056e+11p ps=6.16e+06u
-M1003 VGND A2 a_155_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_808_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.0206e+12p ps=9.18e+06u
-M1005 a_155_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_615_365# A2 a_808_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B1 a_155_47# VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1008 a_155_47# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A1 a_808_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 Y A4 a_313_365# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_155_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_313_365# A3 a_615_365# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_155_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A4 a_155_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_155_47# A4 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A1 a_155_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_615_365# A3 a_313_365# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_313_365# A3 a_615_365# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VGND A2 a_155_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_155_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_313_365# A4 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_155_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_615_365# A3 a_313_365# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 Y A4 a_313_365# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VGND A4 a_155_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_155_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VPWR A1 a_808_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_808_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_615_365# A2 a_808_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 Y B1 a_155_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_808_367# A2 a_615_365# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_155_47# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 VGND A3 a_155_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 VGND A1 a_155_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 a_155_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_4.cdl b/cells/o41ai/sky130_fd_sc_lp__o41ai_4.cdl
index 9c3e4ba..48e45e7 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_4.cdl
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=4 w=1.26 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.26 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.26 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.26 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.26 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.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=4 w=0.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=4 w=0.84 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA3 pndA A4 VNB nfet_01v8 m=4 w=0.84 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.26 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.84 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.84 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.84 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.84 l=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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=4 w=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_lp__o41ai_4
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_4.netlist.tsv b/cells/o41ai/sky130_fd_sc_lp__o41ai_4.netlist.tsv
index d75cf76..3e1f459 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_4.netlist.tsv
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_4.spice b/cells/o41ai/sky130_fd_sc_lp__o41ai_4.spice
index 8933580..f299b3f 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_4.spice
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__o41ai_4 A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 a_1346_367# A2 a_981_361# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7262e+12p pd=1.534e+07u as=1.4112e+12p ps=1.232e+07u
-M1001 a_192_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=2.6922e+12p pd=2.489e+07u as=2.205e+12p ps=1.869e+07u
-M1002 a_554_361# A3 a_981_361# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7262e+12p pd=1.534e+07u as=0p ps=0u
-M1003 VGND A1 a_192_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.7262e+12p pd=1.534e+07u as=1.4112e+12p ps=1.232e+07u
-M1005 VPWR A1 a_1346_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 Y B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_192_47# A4 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A4 a_192_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A2 a_192_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 Y B1 a_192_47# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1011 a_1346_367# A2 a_981_361# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND A2 a_192_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 Y A4 a_554_361# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 Y B1 a_192_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND A3 a_192_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_554_361# A3 a_981_361# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1346_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 Y B1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_192_47# A1 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_981_361# A2 a_1346_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 Y A4 a_554_361# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_981_361# A3 a_554_361# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1346_367# A1 VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_554_361# A4 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_981_361# A2 a_1346_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_192_47# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_981_361# A3 a_554_361# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_192_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_192_47# B1 Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_192_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND A1 a_192_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_192_47# A2 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR B1 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND A3 a_192_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_554_361# A4 Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR A1 a_1346_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND A4 a_192_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_192_47# A4 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_192_47# A3 VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A3 a_192_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_192_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VGND A2 a_192_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_192_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_981_361# A3 a_554_361# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND A1 a_192_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_554_361# A3 a_981_361# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_1346_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VGND A3 a_192_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_1346_367# A2 a_981_361# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_192_47# A1 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_554_361# A3 a_981_361# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_192_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VPWR A1 a_1346_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_192_47# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 Y B1 a_192_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_192_47# A3 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 a_981_361# A2 a_1346_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 a_192_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 VGND A2 a_192_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 a_192_47# B1 Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 Y B1 a_192_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 a_981_361# A2 a_1346_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 a_554_361# A4 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 a_1346_367# A2 a_981_361# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 a_192_47# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 Y A4 a_554_361# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 VGND A4 a_192_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X31 VGND A4 a_192_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X32 a_192_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X33 Y B1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X34 a_981_361# A3 a_554_361# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X35 VPWR A1 a_1346_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X36 VGND A1 a_192_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X37 Y A4 a_554_361# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X38 a_1346_367# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X39 a_554_361# A4 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.cdl b/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.cdl
index c654897..b4bd227 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.cdl
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o41ai_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 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
+MMPA1 sndA1 A2 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
+MMPA2 sndA2 A3 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
+MMPA3 sndA3 A4 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
+MMPB0 VPWR B1 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
+MMNA0 pndA A1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMPA1 sndA1 A2 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMNA3 pndA A4 VNB nfet_01v8 m=1 w=0.42 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 l=0.25 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.42 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.42 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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o41ai_lp
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.netlist.tsv b/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.netlist.tsv
index ef5d6f1..7779cc7 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.netlist.tsv
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o41ai_lp	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	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	sndA3	A4	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPB0	MOSFET	VPWR	B1	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.spice b/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.spice
index 432a084..80f87f0 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.spice
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o41ai_lp A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 a_153_57# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=3.549e+11p pd=4.21e+06u as=3.906e+11p ps=3.54e+06u
-M1001 a_359_419# A3 a_259_419# VPB phighvt w=1e+06u l=250000u
-+  ad=3.2e+11p pd=2.64e+06u as=2.5e+11p ps=2.5e+06u
-M1002 Y B1 VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.8e+11p pd=2.56e+06u as=5.7e+11p ps=5.14e+06u
-M1003 VGND A4 a_153_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A2 a_153_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_153_57# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A1 a_473_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=3.2e+11p ps=2.64e+06u
-M1007 a_153_57# B1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.533e+11p ps=1.57e+06u
-M1008 a_473_419# A2 a_359_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_259_419# A4 Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND A1 a_153_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_359_419# A2 a_473_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 Y B1 a_153_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND A3 a_153_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_153_57# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_473_419# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 Y A4 a_259_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_153_57# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_259_419# A3 a_359_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_m.cdl b/cells/o41ai/sky130_fd_sc_lp__o41ai_m.cdl
index 3782a3b..960f542 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_m.cdl
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__o41ai_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMPA0 VPWR A1 VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.42 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=0.42 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.42 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.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA1 pndA A2 VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA2 pndA A3 VNB nfet_01v8 m=1 w=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNA3 pndA A4 VNB nfet_01v8 m=1 w=0.42 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.42 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.42 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.42 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.42 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.42 l=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNB0 Y B1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__o41ai_m
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_m.netlist.tsv b/cells/o41ai/sky130_fd_sc_lp__o41ai_m.netlist.tsv
index 536cee8..9d9259c 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_m.netlist.tsv
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__o41ai_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA1	MOSFET	sndA1	A2	sndA2	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA2	MOSFET	sndA2	A3	sndA3	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPA3	MOSFET	sndA3	A4	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPB0	MOSFET	VPWR	B1	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA0	MOSFET	pndA	A1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA1	MOSFET	pndA	A2	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA2	MOSFET	pndA	A3	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNA3	MOSFET	pndA	A4	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNB0	MOSFET	Y	B1	pndA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA0	MOSFET	VPWR	A1	sndA1	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA1	MOSFET	sndA1	A2	sndA2	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA2	MOSFET	sndA2	A3	sndA3	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPA3	MOSFET	sndA3	A4	Y	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA0	MOSFET	pndA	A1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA1	MOSFET	pndA	A2	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA2	MOSFET	pndA	A3	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNA3	MOSFET	pndA	A4	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNB0	MOSFET	Y	B1	pndA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_m.spice b/cells/o41ai/sky130_fd_sc_lp__o41ai_m.spice
index f03c9e5..4959ec8 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_m.spice
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__o41ai_m A1 A2 A3 A4 B1 VGND VNB VPB VPWR Y
-M1000 Y B1 VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.911e+11p pd=1.75e+06u as=2.226e+11p ps=2.74e+06u
-M1001 a_463_371# A2 a_355_371# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.638e+11p ps=1.62e+06u
-M1002 a_175_47# A1 VGND VNB nshort w=420000u l=150000u
-+  ad=3.696e+11p pd=4.28e+06u as=2.835e+11p ps=3.03e+06u
-M1003 VPWR A1 a_463_371# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A4 a_175_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_247_371# A4 Y VPB phighvt w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1006 a_175_47# B1 Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.058e+11p ps=1.82e+06u
-M1007 a_175_47# A3 VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_355_371# A3 a_247_371# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A2 a_175_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_175_47# A4 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND A1 a_175_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR B1 Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_355_371# A2 a_463_371# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_463_371# A1 VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VGND A3 a_175_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_175_47# A2 VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_247_371# A3 a_355_371# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 Y A4 a_247_371# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 Y B1 a_175_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/or2/sky130_fd_sc_lp__or2_0.cdl b/cells/or2/sky130_fd_sc_lp__or2_0.cdl
index b9683af..18e6809 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_0.cdl
+++ b/cells/or2/sky130_fd_sc_lp__or2_0.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__or2_0 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMIP2 X y 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
-MMP1 sndPA B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMIN2 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or2_0
diff --git a/cells/or2/sky130_fd_sc_lp__or2_0.netlist.tsv b/cells/or2/sky130_fd_sc_lp__or2_0.netlist.tsv
index d0621cd..632686b 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_0.netlist.tsv
+++ b/cells/or2/sky130_fd_sc_lp__or2_0.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__or2_0	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	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/or2/sky130_fd_sc_lp__or2_0.spice b/cells/or2/sky130_fd_sc_lp__or2_0.spice
index 08f92f5..0bf7fb4 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_0.spice
+++ b/cells/or2/sky130_fd_sc_lp__or2_0.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__or2_0 A B VGND VNB VPB VPWR X
-M1000 a_159_473# B a_76_473# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.113e+11p ps=1.37e+06u
-M1001 X a_76_473# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=3.627e+11p ps=2.52e+06u
-M1002 a_76_473# B VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.289e+11p ps=2.77e+06u
-M1003 VPWR A a_159_473# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VGND A a_76_473# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_76_473# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 VPWR a_76_473# X VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 VGND B a_76_473# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_76_473# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_159_473# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VGND a_76_473# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_76_473# B a_159_473# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/or2/sky130_fd_sc_lp__or2_1.cdl b/cells/or2/sky130_fd_sc_lp__or2_1.cdl
index b4c5b40..14022c8 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_1.cdl
+++ b/cells/or2/sky130_fd_sc_lp__or2_1.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMIP2 X y VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMIN2 X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or2_1
diff --git a/cells/or2/sky130_fd_sc_lp__or2_1.netlist.tsv b/cells/or2/sky130_fd_sc_lp__or2_1.netlist.tsv
index 6fb9184..e4b7446 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_1.netlist.tsv
+++ b/cells/or2/sky130_fd_sc_lp__or2_1.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2/sky130_fd_sc_lp__or2_1.spice b/cells/or2/sky130_fd_sc_lp__or2_1.spice
index 4030f26..5b526fd 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_1.spice
+++ b/cells/or2/sky130_fd_sc_lp__or2_1.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__or2_1 A B VGND VNB VPB VPWR X
-M1000 X a_76_367# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=4.263e+11p ps=4.02e+06u
-M1001 a_76_367# B VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1002 VGND A a_76_367# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_159_367# B a_76_367# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.113e+11p ps=1.37e+06u
-M1004 X a_76_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=5.019e+11p ps=3.85e+06u
-M1005 VPWR A a_159_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_76_367# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND B a_76_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_76_367# B a_159_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_76_367# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_76_367# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_159_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/or2/sky130_fd_sc_lp__or2_2.cdl b/cells/or2/sky130_fd_sc_lp__or2_2.cdl
index bb80ab8..348553e 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_2.cdl
+++ b/cells/or2/sky130_fd_sc_lp__or2_2.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMIP2 X y VPB pfet_01v8_hvt m=2 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMIN2 X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 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_lp__or2_2
diff --git a/cells/or2/sky130_fd_sc_lp__or2_2.netlist.tsv b/cells/or2/sky130_fd_sc_lp__or2_2.netlist.tsv
index 7eab247..0116bb8 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_2.netlist.tsv
+++ b/cells/or2/sky130_fd_sc_lp__or2_2.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2/sky130_fd_sc_lp__or2_2.spice b/cells/or2/sky130_fd_sc_lp__or2_2.spice
index bcf01b1..faba974 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_2.spice
+++ b/cells/or2/sky130_fd_sc_lp__or2_2.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__or2_2 A B VGND VNB VPB VPWR X
-M1000 a_131_390# B a_48_390# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1001 VPWR a_48_390# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.14e+11p pd=6.32e+06u as=3.528e+11p ps=3.08e+06u
-M1002 VGND a_48_390# X VNB nshort w=840000u l=150000u
-+  ad=6.027e+11p pd=6.01e+06u as=2.352e+11p ps=2.24e+06u
-M1003 VGND A a_48_390# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1004 a_48_390# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_48_390# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A a_131_390# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_48_390# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B a_48_390# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_131_390# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VPWR a_48_390# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_48_390# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 X a_48_390# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_48_390# B a_131_390# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VGND a_48_390# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 X a_48_390# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/or2/sky130_fd_sc_lp__or2_4.cdl b/cells/or2/sky130_fd_sc_lp__or2_4.cdl
index 985e14f..38e39a7 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_4.cdl
+++ b/cells/or2/sky130_fd_sc_lp__or2_4.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__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=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=4 w=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_lp__or2_4
diff --git a/cells/or2/sky130_fd_sc_lp__or2_4.netlist.tsv b/cells/or2/sky130_fd_sc_lp__or2_4.netlist.tsv
index 1063f00..88e6373 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_4.netlist.tsv
+++ b/cells/or2/sky130_fd_sc_lp__or2_4.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__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	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	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	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2/sky130_fd_sc_lp__or2_4.spice b/cells/or2/sky130_fd_sc_lp__or2_4.spice
index 8bed4ba..97197db 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_4.spice
+++ b/cells/or2/sky130_fd_sc_lp__or2_4.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__or2_4 A B VGND VNB VPB VPWR X
-M1000 VPWR a_27_367# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.2222e+12p pd=9.5e+06u as=7.056e+11p ps=6.16e+06u
-M1001 X a_27_367# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=9.66e+11p ps=9.02e+06u
-M1002 X a_27_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_27_367# B VGND VNB nshort w=840000u l=150000u
-+  ad=2.478e+11p pd=2.27e+06u as=0p ps=0u
-M1004 VPWR a_27_367# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND a_27_367# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X a_27_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_27_367# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND A a_27_367# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A a_110_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=2.646e+11p ps=2.94e+06u
-M1010 X a_27_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_110_367# B a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
+X0 X a_27_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND a_27_367# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VGND B a_27_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_110_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 X a_27_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_27_367# B a_110_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VPWR a_27_367# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VGND a_27_367# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 X a_27_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VPWR a_27_367# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 X a_27_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_27_367# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/or2/sky130_fd_sc_lp__or2_lp.cdl b/cells/or2/sky130_fd_sc_lp__or2_lp.cdl
index d0a947f..efebba5 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_lp.cdl
+++ b/cells/or2/sky130_fd_sc_lp__or2_lp.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__or2_lp 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMIP2 X y VPB pfet_01v8_hvt m=1 w=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 sndPA B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 net19 y VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net43 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 net19 y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MI7 net43 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN1 y 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
-MMIN2 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net35 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
-MI8 net35 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
-MI5 net47 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI5 net47 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or2_lp
diff --git a/cells/or2/sky130_fd_sc_lp__or2_lp.netlist.tsv b/cells/or2/sky130_fd_sc_lp__or2_lp.netlist.tsv
index 84bed5d..a4f4a6a 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_lp.netlist.tsv
+++ b/cells/or2/sky130_fd_sc_lp__or2_lp.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__or2_lp	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	net19	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net19	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	net43	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net43	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	net35	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	net47	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net35	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net47	y	VGND	VNB	nshort	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	net19	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net19	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	net43	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net43	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	net35	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	net47	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net35	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net47	y	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/or2/sky130_fd_sc_lp__or2_lp.spice b/cells/or2/sky130_fd_sc_lp__or2_lp.spice
index d59452e..80b8385 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_lp.spice
+++ b/cells/or2/sky130_fd_sc_lp__or2_lp.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__or2_lp A B VGND VNB VPB VPWR X
-M1000 a_196_114# B a_154_468# VPB phighvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.008e+11p ps=1.32e+06u
-M1001 a_196_114# A a_118_114# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.008e+11p ps=1.32e+06u
-M1002 a_282_114# B a_196_114# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1003 X a_196_114# a_484_114# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.008e+11p ps=1.32e+06u
-M1004 a_118_114# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.297e+11p ps=3.25e+06u
-M1005 a_484_114# a_196_114# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_154_468# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.82e+06u
-M1007 X a_196_114# a_435_490# VPB phighvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1008 VGND B a_282_114# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_435_490# a_196_114# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_484_114# a_196_114# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR A a_154_468# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VGND A a_118_114# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_435_490# a_196_114# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_118_114# A a_196_114# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_282_114# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_154_468# B a_196_114# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_196_114# B a_282_114# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND a_196_114# a_484_114# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR a_196_114# a_435_490# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/or2/sky130_fd_sc_lp__or2_lp2.cdl b/cells/or2/sky130_fd_sc_lp__or2_lp2.cdl
index 8f7cd11..0233f7b 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_lp2.cdl
+++ b/cells/or2/sky130_fd_sc_lp__or2_lp2.cdl
@@ -16,22 +16,22 @@
 
 .SUBCKT sky130_fd_sc_lp__or2_lp2 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A 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
-MMP1 sndPA B VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B 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 y 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
-MMN0 y 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
-MMN1 net58 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 X y 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
-MMIN2 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net50 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 net58 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
-MI6 y 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
-MI7 net61 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net50 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net61 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or2_lp2
diff --git a/cells/or2/sky130_fd_sc_lp__or2_lp2.netlist.tsv b/cells/or2/sky130_fd_sc_lp__or2_lp2.netlist.tsv
index 0ba092a..e32e89d 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_lp2.netlist.tsv
+++ b/cells/or2/sky130_fd_sc_lp__or2_lp2.netlist.tsv
@@ -1,11 +1,11 @@
 sky130_fd_sc_lp__or2_lp2	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	net61	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	net58	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	net50	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net50	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	y	B	net58	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net61	A	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	net61	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	net58	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	net50	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net50	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	y	B	net58	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net61	A	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/or2/sky130_fd_sc_lp__or2_lp2.spice b/cells/or2/sky130_fd_sc_lp__or2_lp2.spice
index c00d434..6aef70f 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_lp2.spice
+++ b/cells/or2/sky130_fd_sc_lp__or2_lp2.spice
@@ -16,22 +16,13 @@
 
 
 .subckt sky130_fd_sc_lp__or2_lp2 A B VGND VNB VPB VPWR X
-M1000 VGND A a_356_57# VNB nshort w=420000u l=150000u
-+  ad=2.373e+11p pd=2.81e+06u as=8.82e+10p ps=1.26e+06u
-M1001 a_333_409# B a_226_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=2.85e+11p ps=2.57e+06u
-M1002 a_356_57# A a_226_409# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1003 a_514_57# a_226_409# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 X a_226_409# a_514_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1005 VPWR A a_333_409# VPB phighvt w=1e+06u l=250000u
-+  ad=5.25e+11p pd=3.05e+06u as=0p ps=0u
-M1006 X a_226_409# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1007 a_192_57# B VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1008 a_226_409# B a_192_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_192_57# B a_226_409# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_514_57# a_226_409# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_226_409# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_226_409# B a_333_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_226_409# A a_356_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND B a_192_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_356_57# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_333_409# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 VGND a_226_409# a_514_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/or2/sky130_fd_sc_lp__or2_m.cdl b/cells/or2/sky130_fd_sc_lp__or2_m.cdl
index 3d718e6..982aadd 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_m.cdl
+++ b/cells/or2/sky130_fd_sc_lp__or2_m.cdl
@@ -16,16 +16,16 @@
 
 .SUBCKT sky130_fd_sc_lp__or2_m 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMIP2 X y VPB pfet_01v8_hvt m=1 w=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 sndPA B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMIN2 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or2_m
diff --git a/cells/or2/sky130_fd_sc_lp__or2_m.netlist.tsv b/cells/or2/sky130_fd_sc_lp__or2_m.netlist.tsv
index 432278c..dd4d88f 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_m.netlist.tsv
+++ b/cells/or2/sky130_fd_sc_lp__or2_m.netlist.tsv
@@ -1,8 +1,8 @@
 sky130_fd_sc_lp__or2_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	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/or2/sky130_fd_sc_lp__or2_m.spice b/cells/or2/sky130_fd_sc_lp__or2_m.spice
index 4139b55..a6bc3ed 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_m.spice
+++ b/cells/or2/sky130_fd_sc_lp__or2_m.spice
@@ -16,16 +16,10 @@
 
 
 .subckt sky130_fd_sc_lp__or2_m A B VGND VNB VPB VPWR X
-M1000 X a_63_397# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.176e+11p ps=1.4e+06u
-M1001 a_63_397# B VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.289e+11p ps=2.77e+06u
-M1002 VPWR A a_146_397# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1003 VGND A a_63_397# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_146_397# B a_63_397# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 X a_63_397# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 VGND B a_63_397# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR a_63_397# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_63_397# B a_146_397# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_63_397# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_146_397# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VGND a_63_397# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_1.cdl b/cells/or2b/sky130_fd_sc_lp__or2b_1.cdl
index 3fa30e5..edceaf4 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_1.cdl
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMIN1 B B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or2b_1
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_1.netlist.tsv b/cells/or2b/sky130_fd_sc_lp__or2b_1.netlist.tsv
index 6a874f9..610efc5 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_1.netlist.tsv
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.42	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.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_1.spice b/cells/or2b/sky130_fd_sc_lp__or2b_1.spice
index 80c0c36..a444561 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_1.spice
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__or2b_1 A B_N VGND VNB VPB VPWR X
-M1000 VGND B_N a_27_535# VNB nshort w=420000u l=150000u
-+  ad=3.864e+11p pd=3.83e+06u as=1.113e+11p ps=1.37e+06u
-M1001 X a_224_382# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=4.914e+11p ps=4.64e+06u
-M1002 X a_224_382# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1003 a_224_382# a_27_535# VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1004 a_307_367# a_27_535# a_224_382# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.10175e+11p ps=1.37e+06u
-M1005 VPWR A a_307_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR B_N a_27_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 VGND A a_224_382# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_224_382# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_27_535# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_224_382# a_27_535# a_307_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_307_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_27_535# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_27_535# a_224_382# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_224_382# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_224_382# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_2.cdl b/cells/or2b/sky130_fd_sc_lp__or2b_2.cdl
index d130a4b..b92d3bf 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_2.cdl
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=2 w=1.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMIN1 B B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 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_lp__or2b_2
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_2.netlist.tsv b/cells/or2b/sky130_fd_sc_lp__or2b_2.netlist.tsv
index 4cbd0c5..e421a86 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_2.netlist.tsv
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.42	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.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_2.spice b/cells/or2b/sky130_fd_sc_lp__or2b_2.spice
index f439265..20d64c3 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_2.spice
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__or2b_2 A B_N VGND VNB VPB VPWR X
-M1000 X a_191_254# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=9.857e+11p ps=7.64e+06u
-M1001 VGND B_N a_27_49# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1002 VPWR a_191_254# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=8.862e+11p pd=7.14e+06u as=3.528e+11p ps=3.08e+06u
-M1003 VGND a_191_254# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_191_254# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1005 VPWR B_N a_27_49# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1006 a_479_367# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1007 a_191_254# a_27_49# a_479_367# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1008 X a_191_254# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_27_49# a_191_254# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_49# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND A a_191_254# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_27_49# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VPWR a_191_254# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 X a_191_254# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VPWR A a_479_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_191_254# a_27_49# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_191_254# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 X a_191_254# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_479_367# a_27_49# a_191_254# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_4.cdl b/cells/or2b/sky130_fd_sc_lp__or2b_4.cdl
index 545f264..031085c 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_4.cdl
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN1 B B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=4 w=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_lp__or2b_4
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_4.netlist.tsv b/cells/or2b/sky130_fd_sc_lp__or2b_4.netlist.tsv
index 4551e93..4790200 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_4.netlist.tsv
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_4.spice b/cells/or2b/sky130_fd_sc_lp__or2b_4.spice
index f0b9dcd..1b22730 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_4.spice
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_4.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__or2b_4 A B_N VGND VNB VPB VPWR X
-M1000 VGND A a_256_367# VNB nshort w=840000u l=150000u
-+  ad=9.954e+11p pd=9.2e+06u as=2.352e+11p ps=2.24e+06u
-M1001 VPWR A a_339_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.3146e+12p pd=1.084e+07u as=2.646e+11p ps=2.94e+06u
-M1002 VGND a_256_367# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1003 VPWR a_256_367# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1004 VGND a_256_367# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VGND B_N a_27_496# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 VPWR a_256_367# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_256_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR B_N a_27_496# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1009 a_339_367# a_27_496# a_256_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1010 X a_256_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_256_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_256_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_256_367# a_27_496# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_256_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR a_256_367# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_256_367# a_27_496# a_339_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_27_496# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_27_496# a_256_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPWR a_256_367# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND a_256_367# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 X a_256_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND a_256_367# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_27_496# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 X a_256_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_256_367# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 X a_256_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_339_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_lp.cdl b/cells/or2b/sky130_fd_sc_lp__or2b_lp.cdl
index f8a15a5..ed7630c 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_lp.cdl
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_lp.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__or2b_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A 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
-MMP1 sndPA B VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B 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
-MMIP1 B B_N VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIP1 B B_N 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 y 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
-MMN0 net67 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP2 X y 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
-MMN1 y 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
-MMIN1 B B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 net67 A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI5 net58 B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net62 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 y 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
-MI8 net54 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI5 net58 B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net62 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
+MI7 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
+MI8 net54 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or2b_lp
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_lp.netlist.tsv b/cells/or2b/sky130_fd_sc_lp__or2b_lp.netlist.tsv
index d1f378b..01ec762 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_lp.netlist.tsv
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_lp.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__or2b_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	net67	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	net62	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	net58	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	net54	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net58	B_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net62	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	y	A	net67	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net54	y	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	y	VPB	pfet_01v8_hvt	1	1	0.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	net67	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	net62	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN1	MOSFET	B	B_N	net58	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	net54	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net58	B_N	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net62	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	y	A	net67	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net54	y	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/or2b/sky130_fd_sc_lp__or2b_lp.spice b/cells/or2b/sky130_fd_sc_lp__or2b_lp.spice
index c241cf9..6805737 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_lp.spice
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_lp.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__or2b_lp A B_N VGND VNB VPB VPWR X
-M1000 X a_290_409# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=8.5e+11p ps=5.7e+06u
-M1001 a_439_57# A a_290_409# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1002 VGND B_N a_117_57# VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=8.82e+10p ps=1.26e+06u
-M1003 a_597_57# a_290_409# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1004 X a_290_409# a_597_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1005 a_397_409# a_30_57# a_290_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=2.85e+11p ps=2.57e+06u
-M1006 a_117_57# B_N a_30_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1007 a_275_57# a_30_57# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1008 a_290_409# a_30_57# a_275_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A a_439_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR A a_397_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR B_N a_30_57# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
+X0 a_397_409# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_30_57# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_275_57# a_30_57# a_290_409# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_597_57# a_290_409# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR a_290_409# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_439_57# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_290_409# A a_439_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_117_57# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_30_57# B_N a_117_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND a_30_57# a_275_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_290_409# a_30_57# a_397_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 VGND a_290_409# a_597_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_m.cdl b/cells/or2b/sky130_fd_sc_lp__or2b_m.cdl
index 247fd3f..dbc197e 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_m.cdl
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_m.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__or2b_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMIP1 B B_N VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMIP2 X y VPB pfet_01v8_hvt m=1 w=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 sndPA B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP1 B B_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 X y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN1 B B_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMIN1 B B_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or2b_m
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_m.netlist.tsv b/cells/or2b/sky130_fd_sc_lp__or2b_m.netlist.tsv
index 9da1871..dd69032 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_m.netlist.tsv
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_m.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__or2b_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP1	MOSFET	B	B_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN1	MOSFET	B	B_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	X	y	VGND	VNB	nshort	1	0.42	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP2	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	X	y	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/or2b/sky130_fd_sc_lp__or2b_m.spice b/cells/or2b/sky130_fd_sc_lp__or2b_m.spice
index 05df75b..c4f53ab 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_m.spice
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_m.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__or2b_m A B_N VGND VNB VPB VPWR X
-M1000 a_224_378# a_27_496# VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=3.339e+11p ps=3.27e+06u
-M1001 a_307_378# a_27_496# a_224_378# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1002 VGND B_N a_27_496# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1003 VPWR A a_307_378# VPB phighvt w=420000u l=150000u
-+  ad=2.604e+11p pd=2.92e+06u as=0p ps=0u
-M1004 X a_224_378# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1005 VPWR B_N a_27_496# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 X a_224_378# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1007 VGND A a_224_378# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_224_378# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_27_496# B_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR a_224_378# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_224_378# a_27_496# a_307_378# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_307_378# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_27_496# B_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VGND a_224_378# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_27_496# a_224_378# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/or3/sky130_fd_sc_lp__or3_0.cdl b/cells/or3/sky130_fd_sc_lp__or3_0.cdl
index 9ab59c5..1cad2a3 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_0.cdl
+++ b/cells/or3/sky130_fd_sc_lp__or3_0.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__or3_0 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 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=0.64 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMN2 y 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
-MMIN3 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or3_0
diff --git a/cells/or3/sky130_fd_sc_lp__or3_0.netlist.tsv b/cells/or3/sky130_fd_sc_lp__or3_0.netlist.tsv
index e835cac..9647e3f 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_0.netlist.tsv
+++ b/cells/or3/sky130_fd_sc_lp__or3_0.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__or3_0	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nshort	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	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/or3/sky130_fd_sc_lp__or3_0.spice b/cells/or3/sky130_fd_sc_lp__or3_0.spice
index ba454ec..d241161 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_0.spice
+++ b/cells/or3/sky130_fd_sc_lp__or3_0.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__or3_0 A B C VGND VNB VPB VPWR X
-M1000 a_191_481# C a_29_55# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1001 VGND C a_29_55# VNB nshort w=420000u l=150000u
-+  ad=4.326e+11p pd=3.74e+06u as=2.289e+11p ps=2.77e+06u
-M1002 a_263_481# B a_191_481# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1003 VPWR A a_263_481# VPB phighvt w=420000u l=150000u
-+  ad=3.231e+11p pd=2.52e+06u as=0p ps=0u
-M1004 VGND A a_29_55# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_29_55# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1006 X a_29_55# VGND VNB nshort w=420000u l=150000u
-+  ad=1.281e+11p pd=1.45e+06u as=0p ps=0u
-M1007 a_29_55# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_29_55# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND B a_29_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_29_55# C a_191_481# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_191_481# B a_263_481# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_263_481# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_29_55# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_29_55# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_29_55# X VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/or3/sky130_fd_sc_lp__or3_1.cdl b/cells/or3/sky130_fd_sc_lp__or3_1.cdl
index 1722a91..184020d 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_1.cdl
+++ b/cells/or3/sky130_fd_sc_lp__or3_1.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 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.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMN2 y 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
-MMIN3 X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or3_1
diff --git a/cells/or3/sky130_fd_sc_lp__or3_1.netlist.tsv b/cells/or3/sky130_fd_sc_lp__or3_1.netlist.tsv
index 0fd8208..ad30ff0 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_1.netlist.tsv
+++ b/cells/or3/sky130_fd_sc_lp__or3_1.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8_hvt	1	0.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3/sky130_fd_sc_lp__or3_1.spice b/cells/or3/sky130_fd_sc_lp__or3_1.spice
index 70be2df..5f9a5e7 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_1.spice
+++ b/cells/or3/sky130_fd_sc_lp__or3_1.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__or3_1 A B C VGND VNB VPB VPWR X
-M1000 X a_47_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=4.935e+11p ps=3.81e+06u
-M1001 X a_47_47# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=5.502e+11p ps=4.57e+06u
-M1002 VGND A a_47_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.289e+11p ps=2.77e+06u
-M1003 a_157_462# C a_47_47# VPB phighvt w=420000u l=150000u
-+  ad=1.218e+11p pd=1.42e+06u as=1.113e+11p ps=1.37e+06u
-M1004 a_245_462# B a_157_462# VPB phighvt w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1005 VPWR A a_245_462# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_47_47# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND C a_47_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_245_462# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_47_47# C a_157_462# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VGND a_47_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_157_462# B a_245_462# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VGND B a_47_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_47_47# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_47_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_47_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/or3/sky130_fd_sc_lp__or3_2.cdl b/cells/or3/sky130_fd_sc_lp__or3_2.cdl
index 9616d91..764468b 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_2.cdl
+++ b/cells/or3/sky130_fd_sc_lp__or3_2.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 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.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMN2 y 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
-MMIN3 X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X y VNB nfet_01v8 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_lp__or3_2
diff --git a/cells/or3/sky130_fd_sc_lp__or3_2.netlist.tsv b/cells/or3/sky130_fd_sc_lp__or3_2.netlist.tsv
index 4028639..56efe2b 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_2.netlist.tsv
+++ b/cells/or3/sky130_fd_sc_lp__or3_2.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8_hvt	1	0.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3/sky130_fd_sc_lp__or3_2.spice b/cells/or3/sky130_fd_sc_lp__or3_2.spice
index e0624ad..2d97161 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_2.spice
+++ b/cells/or3/sky130_fd_sc_lp__or3_2.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__or3_2 A B C VGND VNB VPB VPWR X
-M1000 VPWR a_35_60# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=9.912e+11p pd=7.3e+06u as=3.528e+11p ps=3.08e+06u
-M1001 a_207_367# B a_132_367# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=9.45e+10p ps=1.29e+06u
-M1002 VPWR A a_207_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND A a_35_60# VNB nshort w=420000u l=150000u
-+  ad=9.983e+11p pd=7.56e+06u as=2.289e+11p ps=2.77e+06u
-M1004 X a_35_60# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_35_60# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1006 VGND C a_35_60# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_35_60# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_35_60# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_132_367# C a_35_60# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 a_132_367# B a_207_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_207_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VGND B a_35_60# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND a_35_60# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 X a_35_60# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_35_60# C a_132_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_35_60# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 X a_35_60# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR a_35_60# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_35_60# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/or3/sky130_fd_sc_lp__or3_4.cdl b/cells/or3/sky130_fd_sc_lp__or3_4.cdl
index 0a73e2a..ba1e687 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_4.cdl
+++ b/cells/or3/sky130_fd_sc_lp__or3_4.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__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=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X y VNB nfet_01v8 m=4 w=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_lp__or3_4
diff --git a/cells/or3/sky130_fd_sc_lp__or3_4.netlist.tsv b/cells/or3/sky130_fd_sc_lp__or3_4.netlist.tsv
index 8882e40..416bfc8 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_4.netlist.tsv
+++ b/cells/or3/sky130_fd_sc_lp__or3_4.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__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	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3/sky130_fd_sc_lp__or3_4.spice b/cells/or3/sky130_fd_sc_lp__or3_4.spice
index 9bbb7d8..ce996a0 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_4.spice
+++ b/cells/or3/sky130_fd_sc_lp__or3_4.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__or3_4 A B C VGND VNB VPB VPWR X
-M1000 a_160_367# C a_77_49# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=3.339e+11p ps=3.05e+06u
-M1001 VGND C a_77_49# VNB nshort w=840000u l=150000u
-+  ad=1.0836e+12p pd=9.3e+06u as=4.578e+11p ps=4.45e+06u
-M1002 X a_77_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=1.2222e+12p ps=9.5e+06u
-M1003 a_232_367# B a_160_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.914e+11p pd=3.3e+06u as=0p ps=0u
-M1004 X a_77_49# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1005 X a_77_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_77_49# B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_232_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_77_49# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_77_49# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VPWR a_77_49# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_77_49# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_77_49# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A a_77_49# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 X a_77_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_77_49# C VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VGND B a_77_49# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_77_49# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR a_77_49# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_232_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_77_49# C a_160_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_160_367# B a_232_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND a_77_49# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 X a_77_49# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VPWR a_77_49# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 X a_77_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VGND a_77_49# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 X a_77_49# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/or3/sky130_fd_sc_lp__or3_lp.cdl b/cells/or3/sky130_fd_sc_lp__or3_lp.cdl
index 220cf82..11a5cc2 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_lp.cdl
+++ b/cells/or3/sky130_fd_sc_lp__or3_lp.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__or3_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A 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
-MMP1 sndPA B VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B 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
-MMP2 sndPB C VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C 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
-MMIP3 X y 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 y 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
-MMN0 y 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
-MMN1 net53 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP3 X y 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
-MMN2 net69 C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 y 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
-MMIN3 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net65 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 net53 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
-MI9 net42 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 net69 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
+MI7 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN3 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net65 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 net42 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or3_lp
diff --git a/cells/or3/sky130_fd_sc_lp__or3_lp.netlist.tsv b/cells/or3/sky130_fd_sc_lp__or3_lp.netlist.tsv
index e1ecb42..ee650af 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_lp.netlist.tsv
+++ b/cells/or3/sky130_fd_sc_lp__or3_lp.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__or3_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	y	C	net69	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	net65	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	net53	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	net69	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	y	B	net53	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	net42	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net65	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net42	y	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	y	C	net69	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	net65	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	net53	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	net69	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	y	B	net53	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	net42	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net65	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net42	y	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/or3/sky130_fd_sc_lp__or3_lp.spice b/cells/or3/sky130_fd_sc_lp__or3_lp.spice
index b958e54..0efc5e1 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_lp.spice
+++ b/cells/or3/sky130_fd_sc_lp__or3_lp.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__or3_lp A B C VGND VNB VPB VPWR X
-M1000 a_541_409# B a_443_409# VPB phighvt w=1e+06u l=250000u
-+  ad=3.2e+11p pd=2.64e+06u as=2.4e+11p ps=2.48e+06u
-M1001 VGND a_108_31# a_138_57# VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=8.82e+10p ps=1.26e+06u
-M1002 a_454_57# B a_108_31# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.373e+11p ps=2.81e+06u
-M1003 a_612_57# C VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 a_108_31# C a_612_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR a_108_31# X VPB phighvt w=1e+06u l=250000u
-+  ad=8.95e+11p pd=3.79e+06u as=2.85e+11p ps=2.57e+06u
-M1006 a_108_31# C a_541_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1007 a_443_409# A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_138_57# a_108_31# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1009 a_296_57# A VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1010 a_108_31# A a_296_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B a_454_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_454_57# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND C a_612_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 X a_108_31# a_138_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND A a_296_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_541_409# C a_108_31# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 VPWR A a_443_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_612_57# C a_108_31# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_443_409# B a_541_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_296_57# A a_108_31# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 X a_108_31# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 a_108_31# B a_454_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_138_57# a_108_31# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/or3/sky130_fd_sc_lp__or3_m.cdl b/cells/or3/sky130_fd_sc_lp__or3_m.cdl
index 41827c9..bf896fa 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_m.cdl
+++ b/cells/or3/sky130_fd_sc_lp__or3_m.cdl
@@ -16,20 +16,20 @@
 
 .SUBCKT sky130_fd_sc_lp__or3_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 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=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 sndPA B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMN2 y 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
-MMIN3 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or3_m
diff --git a/cells/or3/sky130_fd_sc_lp__or3_m.netlist.tsv b/cells/or3/sky130_fd_sc_lp__or3_m.netlist.tsv
index 94acfa9..73cf5bf 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_m.netlist.tsv
+++ b/cells/or3/sky130_fd_sc_lp__or3_m.netlist.tsv
@@ -1,10 +1,10 @@
 sky130_fd_sc_lp__or3_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nshort	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	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/or3/sky130_fd_sc_lp__or3_m.spice b/cells/or3/sky130_fd_sc_lp__or3_m.spice
index cc394c2..d3575a4 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_m.spice
+++ b/cells/or3/sky130_fd_sc_lp__or3_m.spice
@@ -16,20 +16,12 @@
 
 
 .subckt sky130_fd_sc_lp__or3_m A B C VGND VNB VPB VPWR X
-M1000 X a_43_47# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.638e+11p ps=1.62e+06u
-M1001 a_43_47# B VGND VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=4.116e+11p ps=3.64e+06u
-M1002 VGND C a_43_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 X a_43_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1004 VGND A a_43_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_216_397# C a_43_47# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1006 VPWR A a_288_397# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1007 a_288_397# B a_216_397# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_288_397# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VGND B a_43_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_43_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_43_47# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR a_43_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_43_47# C a_216_397# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_216_397# B a_288_397# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND a_43_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_1.cdl b/cells/or3b/sky130_fd_sc_lp__or3b_1.cdl
index 04f6f6a..d074bc7 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_1.cdl
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=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 C C_N VPB pfet_01v8_hvt m=1 w=0.42 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.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMN2 y 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
-MMIN2 C C_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or3b_1
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_1.netlist.tsv b/cells/or3b/sky130_fd_sc_lp__or3b_1.netlist.tsv
index 4922fd9..1f7a584 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_1.netlist.tsv
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8_hvt	1	0.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_1.spice b/cells/or3b/sky130_fd_sc_lp__or3b_1.spice
index bf1787d..4723d3c 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_1.spice
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__or3b_1 A B C_N VGND VNB VPB VPWR X
-M1000 a_375_367# B a_303_367# VPB phighvt w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=8.82e+10p ps=1.26e+06u
-M1001 X a_220_74# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=4.914e+11p ps=4.64e+06u
-M1002 VGND A a_220_74# VNB nshort w=420000u l=150000u
-+  ad=5.145e+11p pd=5.28e+06u as=2.289e+11p ps=2.77e+06u
-M1003 a_110_70# C_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1004 VPWR A a_375_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 X a_220_74# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1006 a_110_70# C_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1007 a_220_74# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_110_70# a_220_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_303_367# a_110_70# a_220_74# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 a_220_74# a_110_70# a_303_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VGND C_N a_110_70# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_303_367# B a_375_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VPWR C_N a_110_70# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VPWR a_220_74# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND B a_220_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_220_74# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_220_74# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_375_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_220_74# a_110_70# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_2.cdl b/cells/or3b/sky130_fd_sc_lp__or3b_2.cdl
index e3e677c..812c8f1 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_2.cdl
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=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 C C_N VPB pfet_01v8_hvt m=1 w=0.42 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.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMN2 y 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
-MMIN2 C C_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X y VNB nfet_01v8 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_lp__or3b_2
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_2.netlist.tsv b/cells/or3b/sky130_fd_sc_lp__or3b_2.netlist.tsv
index 10d3405..0de212e 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_2.netlist.tsv
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8_hvt	1	0.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_2.spice b/cells/or3b/sky130_fd_sc_lp__or3b_2.spice
index fac51de..5e5cae8 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_2.spice
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__or3b_2 A B C_N VGND VNB VPB VPWR X
-M1000 a_448_385# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=7.665e+11p ps=6.57e+06u
-M1001 X a_195_21# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=6.804e+11p ps=6.34e+06u
-M1002 VPWR C_N a_33_131# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1003 VGND B a_195_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.289e+11p ps=2.77e+06u
-M1004 VGND C_N a_33_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 a_195_21# a_33_131# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR a_195_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1007 VGND a_195_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_520_385# B a_448_385# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1009 a_195_21# a_33_131# a_520_385# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1010 X a_195_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_195_21# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_195_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_33_131# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_33_131# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 X a_195_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND a_195_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 X a_195_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_448_385# B a_520_385# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_520_385# a_33_131# a_195_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VGND a_33_131# a_195_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND A a_195_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_195_21# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR A a_448_385# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_4.cdl b/cells/or3b/sky130_fd_sc_lp__or3b_4.cdl
index e431c66..01ae460 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_4.cdl
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.42 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X y VNB nfet_01v8 m=4 w=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_lp__or3b_4
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_4.netlist.tsv b/cells/or3b/sky130_fd_sc_lp__or3b_4.netlist.tsv
index 0c1fdfe..f6919d6 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_4.netlist.tsv
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_4.spice b/cells/or3b/sky130_fd_sc_lp__or3b_4.spice
index 65f1798..e31e88a 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_4.spice
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_4.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__or3b_4 A B C_N VGND VNB VPB VPWR X
-M1000 a_253_23# a_49_133# a_728_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.78e+11p pd=3.12e+06u as=4.914e+11p ps=3.3e+06u
-M1001 X a_253_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=1.3356e+12p ps=1.018e+07u
-M1002 VPWR a_253_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND a_253_23# X VNB nshort w=840000u l=150000u
-+  ad=1.2264e+12p pd=9.98e+06u as=4.704e+11p ps=4.48e+06u
-M1004 a_253_23# A VGND VNB nshort w=840000u l=150000u
-+  ad=4.578e+11p pd=4.45e+06u as=0p ps=0u
-M1005 a_728_367# B a_656_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=2.646e+11p ps=2.94e+06u
-M1006 a_253_23# a_49_133# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND B a_253_23# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_253_23# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_253_23# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_656_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_253_23# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_253_23# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_253_23# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR C_N a_49_133# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1015 VGND C_N a_49_133# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 X a_253_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR a_253_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_49_133# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_728_367# a_49_133# a_253_23# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR A a_656_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 X a_253_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_49_133# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VPWR a_253_23# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND a_253_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VGND a_49_133# a_253_23# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_253_23# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_656_367# B a_728_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 X a_253_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VGND a_253_23# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 X a_253_23# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VGND A a_253_23# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_lp.cdl b/cells/or3b/sky130_fd_sc_lp__or3b_lp.cdl
index cebf427..fc7fdb8 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_lp.cdl
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_lp.cdl
@@ -16,34 +16,34 @@
 
 .SUBCKT sky130_fd_sc_lp__or3b_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A 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
-MMP1 sndPA B VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B 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
-MMP2 sndPB C VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C 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 C C_N VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIP2 C C_N 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
-MMIP3 X y 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
-MMN0 net89 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP3 X y 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
-MMN1 net85 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 net89 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
-MMN2 y 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
-MMIN2 C C_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 net85 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
-MMIN3 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 y 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
-MI7 net65 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net80 C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 y 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
-MI6 net76 C_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI11 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
+MI7 net65 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net80 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
+MI10 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net76 C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or3b_lp
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_lp.netlist.tsv b/cells/or3b/sky130_fd_sc_lp__or3b_lp.netlist.tsv
index 53d9b9f..5ef3b4e 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_lp.netlist.tsv
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_lp.netlist.tsv
@@ -1,17 +1,17 @@
 sky130_fd_sc_lp__or3b_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	net89	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	net85	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	net80	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	net76	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	net65	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	y	A	net89	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net65	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net80	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	y	B	net85	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net76	C_N	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8_hvt	1	1	0.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	net89	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	net85	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	net80	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	net76	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	net65	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	y	A	net89	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net65	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net80	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	y	B	net85	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net76	C_N	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/or3b/sky130_fd_sc_lp__or3b_lp.spice b/cells/or3b/sky130_fd_sc_lp__or3b_lp.spice
index 674035d..4cd0fc9 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_lp.spice
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_lp.spice
@@ -16,34 +16,19 @@
 
 
 .subckt sky130_fd_sc_lp__or3b_lp A B C_N VGND VNB VPB VPWR X
-M1000 X a_350_47# a_804_101# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VPWR C_N a_27_47# VPB phighvt w=1e+06u l=250000u
-+  ad=6.75e+11p pd=5.35e+06u as=2.85e+11p ps=2.57e+06u
-M1002 a_114_47# C_N a_27_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1003 a_272_47# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.549e+11p ps=4.21e+06u
-M1004 a_350_47# a_27_47# a_272_47# VNB nshort w=420000u l=150000u
-+  ad=3.465e+11p pd=3.81e+06u as=0p ps=0u
-M1005 VGND A a_640_101# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1006 a_350_47# B a_466_185# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1007 a_804_101# a_350_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_628_419# B a_263_373# VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=5.7e+11p ps=5.14e+06u
-M1009 a_466_185# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_350_47# a_27_47# a_263_373# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1011 X a_350_47# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1012 VPWR A a_628_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_640_101# A a_350_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND C_N a_114_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_114_47# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_27_47# C_N a_114_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND a_27_47# a_272_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_350_47# A a_640_101# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_640_101# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_27_47# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_804_101# a_350_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_263_373# B a_628_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_466_185# B a_350_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR a_350_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 VGND a_350_47# a_804_101# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_628_419# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 a_272_47# a_27_47# a_350_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_263_373# a_27_47# a_350_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X14 VGND B a_466_185# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_m.cdl b/cells/or3b/sky130_fd_sc_lp__or3b_m.cdl
index 5c1b360..046815b 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_m.cdl
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__or3b_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=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 C C_N VPB pfet_01v8_hvt m=1 w=0.42 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=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 sndPA B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 X y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMN2 y 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
-MMIN2 C C_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or3b_m
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_m.netlist.tsv b/cells/or3b/sky130_fd_sc_lp__or3b_m.netlist.tsv
index 6195504..5f0a4f7 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_m.netlist.tsv
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__or3b_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	y	VGND	VNB	nshort	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	y	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	y	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/or3b/sky130_fd_sc_lp__or3b_m.spice b/cells/or3b/sky130_fd_sc_lp__or3b_m.spice
index 64084fc..203291d 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_m.spice
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__or3b_m A B C_N VGND VNB VPB VPWR X
-M1000 a_112_55# C_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=3.465e+11p ps=4.17e+06u
-M1001 X a_212_418# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1002 a_212_418# B VGND VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=0p ps=0u
-M1003 a_371_418# B a_299_418# VPB phighvt w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=8.82e+10p ps=1.26e+06u
-M1004 a_299_418# a_112_55# a_212_418# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.16025e+11p ps=1.41e+06u
-M1005 a_112_55# C_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=2.478e+11p ps=2.86e+06u
-M1006 X a_212_418# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1007 VGND A a_212_418# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_112_55# a_212_418# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR A a_371_418# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_371_418# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VPWR a_212_418# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VPWR C_N a_112_55# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_212_418# a_112_55# a_299_418# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VGND C_N a_112_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_212_418# a_112_55# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_299_418# B a_371_418# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND B a_212_418# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_212_418# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND a_212_418# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/or4/sky130_fd_sc_lp__or4_0.cdl b/cells/or4/sky130_fd_sc_lp__or4_0.cdl
index f4e5cfb..7d931f9 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_0.cdl
+++ b/cells/or4/sky130_fd_sc_lp__or4_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__or4_0 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=0.64 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMN2 y 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
-MMN3 y 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
-MMIN4 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or4_0
diff --git a/cells/or4/sky130_fd_sc_lp__or4_0.netlist.tsv b/cells/or4/sky130_fd_sc_lp__or4_0.netlist.tsv
index b01bdb8..3a930ee 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_0.netlist.tsv
+++ b/cells/or4/sky130_fd_sc_lp__or4_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__or4_0	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	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/or4/sky130_fd_sc_lp__or4_0.spice b/cells/or4/sky130_fd_sc_lp__or4_0.spice
index 793e53d..3922f52 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_0.spice
+++ b/cells/or4/sky130_fd_sc_lp__or4_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__or4_0 A B C D VGND VNB VPB VPWR X
-M1000 a_54_482# D VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=5.187e+11p ps=4.99e+06u
-M1001 X a_54_482# VGND VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=0p ps=0u
-M1002 VGND A a_54_482# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_227_482# C a_137_482# VPB phighvt w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=1.26e+11p ps=1.44e+06u
-M1004 X a_54_482# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=3.548e+11p ps=2.65e+06u
-M1005 a_137_482# D a_54_482# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 a_317_482# B a_227_482# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1007 a_54_482# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A a_317_482# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND C a_54_482# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_54_482# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_137_482# C a_227_482# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_54_482# D a_137_482# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_54_482# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND B a_54_482# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_54_482# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_227_482# B a_317_482# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_317_482# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VPWR a_54_482# X VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 VGND D a_54_482# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/or4/sky130_fd_sc_lp__or4_1.cdl b/cells/or4/sky130_fd_sc_lp__or4_1.cdl
index 2426fc4..4306c2a 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_1.cdl
+++ b/cells/or4/sky130_fd_sc_lp__or4_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMN2 y 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
-MMN3 y 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
-MMIN4 X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or4_1
diff --git a/cells/or4/sky130_fd_sc_lp__or4_1.netlist.tsv b/cells/or4/sky130_fd_sc_lp__or4_1.netlist.tsv
index 28aa6fd..afa7b63 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_1.netlist.tsv
+++ b/cells/or4/sky130_fd_sc_lp__or4_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	1	0.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4/sky130_fd_sc_lp__or4_1.spice b/cells/or4/sky130_fd_sc_lp__or4_1.spice
index c9ae26d..21d501d 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_1.spice
+++ b/cells/or4/sky130_fd_sc_lp__or4_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__or4_1 A B C D VGND VNB VPB VPWR X
-M1000 a_40_480# B VGND VNB nshort w=420000u l=150000u
-+  ad=2.436e+11p pd=2.84e+06u as=6.258e+11p ps=5.81e+06u
-M1001 VGND C a_40_480# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VGND A a_40_480# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_40_480# D VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_195_480# C a_123_480# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=8.82e+10p ps=1.26e+06u
-M1005 a_267_480# B a_195_480# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1006 a_123_480# D a_40_480# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 X a_40_480# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=6.909e+11p ps=4.75e+06u
-M1008 VPWR A a_267_480# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 X a_40_480# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
+X0 a_123_480# C a_195_480# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_195_480# B a_267_480# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_267_480# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_40_480# D a_123_480# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VGND D a_40_480# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_40_480# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_40_480# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND B a_40_480# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND a_40_480# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VPWR a_40_480# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/or4/sky130_fd_sc_lp__or4_2.cdl b/cells/or4/sky130_fd_sc_lp__or4_2.cdl
index 73aabe8..2e7f488 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_2.cdl
+++ b/cells/or4/sky130_fd_sc_lp__or4_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMN2 y 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
-MMN3 y 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
-MMIN4 X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 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_lp__or4_2
diff --git a/cells/or4/sky130_fd_sc_lp__or4_2.netlist.tsv b/cells/or4/sky130_fd_sc_lp__or4_2.netlist.tsv
index 6ac8e99..200bd33 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_2.netlist.tsv
+++ b/cells/or4/sky130_fd_sc_lp__or4_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	1	0.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4/sky130_fd_sc_lp__or4_2.spice b/cells/or4/sky130_fd_sc_lp__or4_2.spice
index 04000ff..b2dff34 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_2.spice
+++ b/cells/or4/sky130_fd_sc_lp__or4_2.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__or4_2 A B C D VGND VNB VPB VPWR X
-M1000 a_72_367# B VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=9.429e+11p ps=8.24e+06u
-M1001 a_335_367# B a_227_367# VPB phighvt w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=1.638e+11p ps=1.62e+06u
-M1002 VGND C a_72_367# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VGND a_72_367# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1004 X a_72_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=8.148e+11p ps=6.8e+06u
-M1005 a_227_367# C a_155_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1006 VGND A a_72_367# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR A a_335_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_155_367# D a_72_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1009 VPWR a_72_367# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_72_367# D VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_72_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_227_367# B a_335_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_72_367# D a_155_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VPWR a_72_367# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND a_72_367# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 X a_72_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 X a_72_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_155_367# C a_227_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND B a_72_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_72_367# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND D a_72_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_72_367# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_335_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/or4/sky130_fd_sc_lp__or4_4.cdl b/cells/or4/sky130_fd_sc_lp__or4_4.cdl
index 724975b..46fd6fa 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_4.cdl
+++ b/cells/or4/sky130_fd_sc_lp__or4_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 m=4 w=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_lp__or4_4
diff --git a/cells/or4/sky130_fd_sc_lp__or4_4.netlist.tsv b/cells/or4/sky130_fd_sc_lp__or4_4.netlist.tsv
index 07beb9f..84c5203 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_4.netlist.tsv
+++ b/cells/or4/sky130_fd_sc_lp__or4_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4/sky130_fd_sc_lp__or4_4.spice b/cells/or4/sky130_fd_sc_lp__or4_4.spice
index 2196710..b24791b 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_4.spice
+++ b/cells/or4/sky130_fd_sc_lp__or4_4.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__or4_4 A B C D VGND VNB VPB VPWR X
-M1000 a_141_367# D a_58_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=3.339e+11p ps=3.05e+06u
-M1001 VPWR a_58_367# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.2222e+12p pd=9.5e+06u as=7.056e+11p ps=6.16e+06u
-M1002 a_321_367# B a_213_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.914e+11p pd=3.3e+06u as=4.914e+11p ps=3.3e+06u
-M1003 VPWR a_58_367# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_58_367# D VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=1.3986e+12p ps=1.173e+07u
-M1005 VGND a_58_367# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1006 X a_58_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_58_367# B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR A a_321_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND C a_58_367# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 X a_58_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 X a_58_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_213_367# C a_141_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND A a_58_367# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND a_58_367# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 X a_58_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_58_367# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 X a_58_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_58_367# D a_141_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_321_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VPWR a_58_367# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 X a_58_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND D a_58_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 X a_58_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_213_367# B a_321_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_141_367# C a_213_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_58_367# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VGND a_58_367# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 X a_58_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VPWR a_58_367# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_58_367# C VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 VGND B a_58_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/or4/sky130_fd_sc_lp__or4_lp.cdl b/cells/or4/sky130_fd_sc_lp__or4_lp.cdl
index e80886e..fc81ce7 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_lp.cdl
+++ b/cells/or4/sky130_fd_sc_lp__or4_lp.cdl
@@ -16,34 +16,34 @@
 
 .SUBCKT sky130_fd_sc_lp__or4_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A 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
-MMP1 sndPA B VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B 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
-MMP2 sndPB C VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C 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
-MMP3 sndPC D VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D 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
-MMIP4 X y 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
-MMN0 y 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
-MI10 y 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
-MMN1 net80 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP4 X y 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
-MMN2 net55 C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net87 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI10 y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 net68 D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 net80 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
-MMIN4 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 net55 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
-MI8 y 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
-MI9 y 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
-MI11 net52 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI7 net87 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
+MMN3 net68 D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI11 net52 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or4_lp
diff --git a/cells/or4/sky130_fd_sc_lp__or4_lp.netlist.tsv b/cells/or4/sky130_fd_sc_lp__or4_lp.netlist.tsv
index 99003da..744a943 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_lp.netlist.tsv
+++ b/cells/or4/sky130_fd_sc_lp__or4_lp.netlist.tsv
@@ -1,17 +1,17 @@
 sky130_fd_sc_lp__or4_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	net87	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	y	D	net68	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	net80	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	net55	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net87	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	net68	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	net52	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	y	B	net80	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	y	C	net55	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net52	y	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	net87	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	y	D	net68	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	net80	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	net55	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net87	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	net68	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	net52	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	y	B	net80	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	y	C	net55	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net52	y	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/or4/sky130_fd_sc_lp__or4_lp.spice b/cells/or4/sky130_fd_sc_lp__or4_lp.spice
index 2184761..8583c1b 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_lp.spice
+++ b/cells/or4/sky130_fd_sc_lp__or4_lp.spice
@@ -16,34 +16,19 @@
 
 
 .subckt sky130_fd_sc_lp__or4_lp A B C D VGND VNB VPB VPWR X
-M1000 VGND A a_646_167# VNB nshort w=420000u l=150000u
-+  ad=3.549e+11p pd=4.21e+06u as=8.82e+10p ps=1.26e+06u
-M1001 a_154_419# D a_27_47# VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=2.85e+11p ps=2.57e+06u
-M1002 a_804_167# a_27_47# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1003 a_646_167# A a_27_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.906e+11p ps=4.38e+06u
-M1004 a_114_47# D a_27_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1005 a_272_47# C VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1006 a_27_47# C a_272_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_366_419# B a_252_419# VPB phighvt w=1e+06u l=250000u
-+  ad=1.21e+12p pd=4.42e+06u as=3.2e+11p ps=2.64e+06u
-M1008 X a_27_47# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=5.65e+11p ps=3.13e+06u
-M1009 a_252_419# C a_154_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_47# B a_465_185# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.5225e+11p ps=1.67e+06u
-M1011 a_465_185# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VPWR A a_366_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 X a_27_47# a_804_167# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1014 VGND D a_114_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_114_47# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_27_47# D a_114_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND C a_272_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_154_419# C a_252_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_252_419# B a_366_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_366_419# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_27_47# A a_646_167# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_465_185# B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_27_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_646_167# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_272_47# C a_27_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_804_167# a_27_47# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND B a_465_185# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VGND a_27_47# a_804_167# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_27_47# D a_154_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/or4/sky130_fd_sc_lp__or4_m.cdl b/cells/or4/sky130_fd_sc_lp__or4_m.cdl
index a0a3084..77e65e4 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_m.cdl
+++ b/cells/or4/sky130_fd_sc_lp__or4_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__or4_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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=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 sndPA B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMN2 y 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
-MMN3 y 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
-MMIN4 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or4_m
diff --git a/cells/or4/sky130_fd_sc_lp__or4_m.netlist.tsv b/cells/or4/sky130_fd_sc_lp__or4_m.netlist.tsv
index fd4021b..7b37114 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_m.netlist.tsv
+++ b/cells/or4/sky130_fd_sc_lp__or4_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__or4_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	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/or4/sky130_fd_sc_lp__or4_m.spice b/cells/or4/sky130_fd_sc_lp__or4_m.spice
index e1b066a..93c6362 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_m.spice
+++ b/cells/or4/sky130_fd_sc_lp__or4_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__or4_m A B C D VGND VNB VPB VPWR X
-M1000 VPWR A a_343_397# VPB phighvt w=420000u l=150000u
-+  ad=2.499e+11p pd=2.03e+06u as=8.82e+10p ps=1.26e+06u
-M1001 a_116_397# B VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=5.817e+11p ps=5.29e+06u
-M1002 a_271_397# C a_199_397# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=8.82e+10p ps=1.26e+06u
-M1003 a_199_397# D a_116_397# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 X a_116_397# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1005 a_343_397# B a_271_397# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_116_397# D VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A a_116_397# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_116_397# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1009 VGND C a_116_397# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_116_397# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_343_397# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_116_397# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_116_397# D a_199_397# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VGND D a_116_397# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_199_397# C a_271_397# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_271_397# B a_343_397# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND a_116_397# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_116_397# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VGND B a_116_397# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_1.cdl b/cells/or4b/sky130_fd_sc_lp__or4b_1.cdl
index dc7b8fe..967fdcb 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_1.cdl
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_1.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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.42 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.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMN2 y 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
-MMN3 y 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
-MMIN3 D D_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or4b_1
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_1.netlist.tsv b/cells/or4b/sky130_fd_sc_lp__or4b_1.netlist.tsv
index 44535c2..dea7c83 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_1.netlist.tsv
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_1.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	1	0.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_1.spice b/cells/or4b/sky130_fd_sc_lp__or4b_1.spice
index 99b76ed..36192d8 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_1.spice
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_1.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__or4b_1 A B C D_N VGND VNB VPB VPWR X
-M1000 VGND A a_220_367# VNB nshort w=420000u l=150000u
-+  ad=6.636e+11p pd=5.99e+06u as=2.352e+11p ps=2.8e+06u
-M1001 X a_220_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=4.914e+11p ps=4.64e+06u
-M1002 a_220_367# a_64_131# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 a_483_367# B a_397_367# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1004 VPWR A a_483_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR D_N a_64_131# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1006 VGND D_N a_64_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 a_397_367# C a_303_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1008 X a_220_367# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1009 a_303_367# a_64_131# a_220_367# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1010 VGND C a_220_367# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_220_367# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_483_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_220_367# a_64_131# a_303_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VGND a_64_131# a_220_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_220_367# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND B a_220_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_303_367# C a_397_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VPWR a_220_367# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VGND a_220_367# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_220_367# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_64_131# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_64_131# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_397_367# B a_483_367# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_2.cdl b/cells/or4b/sky130_fd_sc_lp__or4b_2.cdl
index 673aa10..af8a966 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_2.cdl
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_2.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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.42 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.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMN2 y 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
-MMN3 y 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
-MMIN3 D D_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 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_lp__or4b_2
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_2.netlist.tsv b/cells/or4b/sky130_fd_sc_lp__or4b_2.netlist.tsv
index d2d6199..9376e79 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_2.netlist.tsv
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_2.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	1	0.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_2.spice b/cells/or4b/sky130_fd_sc_lp__or4b_2.spice
index f7917bb..d41e8b5 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_2.spice
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_2.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__or4b_2 A B C D_N VGND VNB VPB VPWR X
-M1000 X a_189_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=8.148e+11p ps=6.8e+06u
-M1001 a_189_21# C VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=8.085e+11p ps=7.83e+06u
-M1002 X a_189_21# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1003 a_436_385# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 a_616_385# C a_508_385# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.638e+11p ps=1.62e+06u
-M1005 VGND B a_189_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_189_21# a_31_131# a_616_385# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1007 VGND a_189_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR D_N a_31_131# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1009 VPWR a_189_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_189_21# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_31_131# a_189_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND D_N a_31_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1013 a_508_385# B a_436_385# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_436_385# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 X a_189_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_508_385# C a_616_385# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_616_385# a_31_131# a_189_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_436_385# B a_508_385# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VGND C a_189_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_31_131# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND a_189_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND A a_189_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 X a_189_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_189_21# a_31_131# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_189_21# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_31_131# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VPWR a_189_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_4.cdl b/cells/or4b/sky130_fd_sc_lp__or4b_4.cdl
index d7b80dd..1ee0fbc 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_4.cdl
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_4.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__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=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.42 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 m=4 w=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_lp__or4b_4
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_4.netlist.tsv b/cells/or4b/sky130_fd_sc_lp__or4b_4.netlist.tsv
index c700bb8..3820cc7 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_4.netlist.tsv
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_4.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__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	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_4.spice b/cells/or4b/sky130_fd_sc_lp__or4b_4.spice
index c129330..9a678f3 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_4.spice
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_4.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_lp__or4b_4 A B C D_N VGND VNB VPB VPWR X
-M1000 X a_83_21# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=1.6611e+12p ps=1.281e+07u
-M1001 VPWR a_83_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.2894e+12p pd=1.08e+07u as=7.056e+11p ps=6.16e+06u
-M1002 a_737_315# D_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1003 a_83_21# C VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1004 a_659_367# C a_551_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.914e+11p pd=3.3e+06u as=4.914e+11p ps=3.3e+06u
-M1005 VPWR a_83_21# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_83_21# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_83_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 X a_83_21# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_737_315# a_83_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_83_21# a_737_315# a_659_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1011 X a_83_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_83_21# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND B a_83_21# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_83_21# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_479_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1016 a_551_367# B a_479_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_737_315# D_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 X a_83_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND C a_83_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_659_367# a_737_315# a_83_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 VGND D_N a_737_315# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_83_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_83_21# a_737_315# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 X a_83_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_551_367# C a_659_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR A a_479_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VPWR a_83_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR D_N a_737_315# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 VPWR a_83_21# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VGND A a_83_21# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_83_21# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 a_479_367# B a_551_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 X a_83_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 X a_83_21# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 VGND a_83_21# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_lp.cdl b/cells/or4b/sky130_fd_sc_lp__or4b_lp.cdl
index e533794..7489c8e 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_lp.cdl
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_lp.cdl
@@ -16,40 +16,40 @@
 
 .SUBCKT sky130_fd_sc_lp__or4b_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A 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
-MMP1 sndPA B VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B 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
-MMP2 sndPB C VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C 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
-MMP3 sndPC D VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D 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
-MMIP3 D D_N VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIP3 D D_N 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
-MMIP4 X y 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
-MI12 y 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
-MMN0 y 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
-MMN1 net59 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP4 X y 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
-MMN2 net84 C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI12 y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 y 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
-MMN3 net76 D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net72 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 net59 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
-MMIN3 D D_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 net84 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
-MMIN4 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI11 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 y 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
-MI8 net56 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 net76 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
-MI7 net67 D_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 net72 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
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MMIN4 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net56 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net67 D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or4b_lp
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_lp.netlist.tsv b/cells/or4b/sky130_fd_sc_lp__or4b_lp.netlist.tsv
index 396a3d8..7572cdd 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_lp.netlist.tsv
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_lp.netlist.tsv
@@ -1,20 +1,20 @@
 sky130_fd_sc_lp__or4b_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	y	D	net76	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	net72	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	net59	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	net84	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	y	C	net84	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	net76	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net72	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	net67	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	net56	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	y	B	net59	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net56	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net67	D_N	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	1	1	0.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	y	D	net76	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	net72	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	net59	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	net84	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	y	C	net84	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	net76	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net72	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	net67	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	net56	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	y	B	net59	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net56	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net67	D_N	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/or4b/sky130_fd_sc_lp__or4b_lp.spice b/cells/or4b/sky130_fd_sc_lp__or4b_lp.spice
index 8a268f2..d735078 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_lp.spice
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_lp.spice
@@ -16,40 +16,22 @@
 
 
 .subckt sky130_fd_sc_lp__or4b_lp A B C D_N VGND VNB VPB VPWR X
-M1000 a_311_417# a_27_57# a_270_57# VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=8.82e+10p ps=1.26e+06u
-M1001 VGND C a_428_57# VNB nshort w=420000u l=150000u
-+  ad=3.528e+11p pd=4.2e+06u as=8.82e+10p ps=1.26e+06u
-M1002 a_744_57# A a_311_417# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1003 a_902_57# a_311_417# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 X a_311_417# a_902_57# VNB nshort w=420000u l=150000u
-+  ad=1.155e+11p pd=1.39e+06u as=0p ps=0u
-M1005 a_422_417# a_27_57# a_311_417# VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=3.05e+11p ps=2.61e+06u
-M1006 VPWR D_N a_27_57# VPB phighvt w=1e+06u l=250000u
-+  ad=6.55e+11p pd=5.31e+06u as=2.85e+11p ps=2.57e+06u
-M1007 a_428_57# C a_311_417# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_634_417# B a_520_417# VPB phighvt w=1e+06u l=250000u
-+  ad=3.6e+11p pd=2.72e+06u as=3.2e+11p ps=2.64e+06u
-M1009 X a_311_417# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1010 a_520_417# C a_422_417# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND D_N a_112_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1012 a_586_57# B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1013 a_311_417# B a_586_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VGND A a_744_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A a_634_417# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_112_57# D_N a_27_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1017 a_270_57# a_27_57# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_311_417# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_270_57# a_27_57# a_311_417# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_311_417# a_27_57# a_422_417# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_586_57# B a_311_417# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_311_417# A a_744_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_428_57# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_422_417# C a_520_417# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_744_57# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND a_311_417# a_902_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_112_57# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_27_57# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 a_27_57# D_N a_112_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND a_27_57# a_270_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_520_417# B a_634_417# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X14 VGND B a_586_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_311_417# C a_428_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_634_417# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X17 a_902_57# a_311_417# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_m.cdl b/cells/or4b/sky130_fd_sc_lp__or4b_m.cdl
index 367229a..0179406 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_m.cdl
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_m.cdl
@@ -16,28 +16,28 @@
 
 .SUBCKT sky130_fd_sc_lp__or4b_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 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=0.42 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.42 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=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 sndPA B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMN2 y 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
-MMN3 y 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
-MMIN3 D D_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or4b_m
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_m.netlist.tsv b/cells/or4b/sky130_fd_sc_lp__or4b_m.netlist.tsv
index 7acc505..21e44e8 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_m.netlist.tsv
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_m.netlist.tsv
@@ -1,14 +1,14 @@
 sky130_fd_sc_lp__or4b_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	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/or4b/sky130_fd_sc_lp__or4b_m.spice b/cells/or4b/sky130_fd_sc_lp__or4b_m.spice
index 1ee4686..5a400aa 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_m.spice
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_m.spice
@@ -16,28 +16,16 @@
 
 
 .subckt sky130_fd_sc_lp__or4b_m A B C D_N VGND VNB VPB VPWR X
-M1000 a_338_397# a_38_125# a_215_125# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1001 X a_215_125# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=2.751e+11p ps=2.99e+06u
-M1002 a_215_125# B VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=5.943e+11p ps=5.35e+06u
-M1003 VGND D_N a_38_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 VPWR D_N a_38_125# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 a_215_125# a_38_125# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND C a_215_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X a_215_125# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1008 a_410_397# C a_338_397# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1009 a_482_397# B a_410_397# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1010 VPWR A a_482_397# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND A a_215_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_215_125# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_38_125# D_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_215_125# a_38_125# a_338_397# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VGND a_38_125# a_215_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_38_125# D_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND B a_215_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_215_125# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_215_125# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_215_125# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_338_397# C a_410_397# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_410_397# B a_482_397# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_482_397# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_1.cdl b/cells/or4bb/sky130_fd_sc_lp__or4bb_1.cdl
index 14b6766..209b429 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_1.cdl
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_1.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 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=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 C C_N VPB pfet_01v8_hvt m=1 w=0.42 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.42 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.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMN2 y 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
-MMN3 y 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
-MMIN2 C C_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or4bb_1
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_1.netlist.tsv b/cells/or4bb/sky130_fd_sc_lp__or4bb_1.netlist.tsv
index c525d30..b8c8b18 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_1.netlist.tsv
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_1.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	1	0.42	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.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_1.spice b/cells/or4bb/sky130_fd_sc_lp__or4bb_1.spice
index e54f891..a7d261e 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_1.spice
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_1.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__or4bb_1 A B C_N D_N VGND VNB VPB VPWR X
-M1000 a_415_391# a_196_535# a_332_391# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1001 X a_332_391# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=4.977e+11p ps=4.67e+06u
-M1002 a_487_391# a_27_535# a_415_391# VPB phighvt w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1003 a_196_535# D_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1004 VGND a_27_535# a_332_391# VNB nshort w=420000u l=150000u
-+  ad=6.573e+11p pd=6.8e+06u as=2.352e+11p ps=2.8e+06u
-M1005 a_595_391# B a_487_391# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1006 VPWR A a_595_391# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A a_332_391# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND C_N a_27_535# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1009 a_196_535# D_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1010 a_332_391# a_196_535# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR C_N a_27_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1012 X a_332_391# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1013 a_332_391# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR D_N a_196_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_27_535# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VGND B a_332_391# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_487_391# B a_595_391# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_595_391# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_332_391# a_196_535# a_415_391# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_415_391# a_27_535# a_487_391# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND a_196_535# a_332_391# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_332_391# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_27_535# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND a_332_391# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_332_391# a_27_535# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VPWR a_332_391# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 VGND D_N a_196_535# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_2.cdl b/cells/or4bb/sky130_fd_sc_lp__or4bb_2.cdl
index d9d0aac..3dbcdc9 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_2.cdl
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_2.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 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=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 C C_N VPB pfet_01v8_hvt m=1 w=0.42 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.42 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.26 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMN2 y 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
-MMN3 y 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
-MMIN2 C C_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 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_lp__or4bb_2
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_2.netlist.tsv b/cells/or4bb/sky130_fd_sc_lp__or4bb_2.netlist.tsv
index 394aa91..0580117 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_2.netlist.tsv
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_2.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	2	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	1	0.42	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.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_2.spice b/cells/or4bb/sky130_fd_sc_lp__or4bb_2.spice
index e0c840f..af152db 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_2.spice
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_2.spice
@@ -16,36 +16,20 @@
 
 
 .subckt sky130_fd_sc_lp__or4bb_2 A B C_N D_N VGND VNB VPB VPWR X
-M1000 a_276_47# A VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=1.0133e+12p ps=8.83e+06u
-M1001 VGND a_462_351# a_276_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_276_403# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=8.316e+11p ps=7.72e+06u
-M1003 VGND C_N a_40_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 a_348_403# B a_276_403# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1005 X a_276_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1006 VGND B a_276_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VPWR C_N a_40_47# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1008 VGND a_276_47# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1009 a_462_351# D_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1010 a_276_47# a_40_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_462_351# D_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1012 a_420_403# a_40_47# a_348_403# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1013 VPWR a_276_47# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 X a_276_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_276_47# a_462_351# a_420_403# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 VGND a_40_47# a_276_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 X a_276_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_40_47# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_276_47# a_462_351# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND D_N a_462_351# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR D_N a_462_351# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_348_403# a_40_47# a_420_403# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_420_403# a_462_351# a_276_47# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VPWR a_276_47# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_40_47# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 VPWR A a_276_403# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_276_403# B a_348_403# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 VGND a_276_47# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VGND A a_276_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_276_47# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 X a_276_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_4.cdl b/cells/or4bb/sky130_fd_sc_lp__or4bb_4.cdl
index 848ad47..e9578a7 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_4.cdl
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_4.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__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=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.42 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.42 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.26 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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y A VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN1 y B VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN2 y C VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMN3 y D VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265 sd=0.28
-+ topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 m=4 w=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_lp__or4bb_4
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_4.netlist.tsv b/cells/or4bb/sky130_fd_sc_lp__or4bb_4.netlist.tsv
index 29615f3..2e30361 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_4.netlist.tsv
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_4.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__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	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.26	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.42	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.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.84	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_4.spice b/cells/or4bb/sky130_fd_sc_lp__or4bb_4.spice
index fffc581..4c09d9a 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_4.spice
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_4.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__or4bb_4 A B C_N D_N VGND VNB VPB VPWR X
-M1000 VPWR a_270_53# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4532e+12p pd=1.27e+07u as=7.056e+11p ps=6.16e+06u
-M1001 a_270_53# A VGND VNB nshort w=840000u l=150000u
-+  ad=5.208e+11p pd=4.6e+06u as=1.8624e+12p ps=1.354e+07u
-M1002 a_270_53# a_528_27# a_450_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=4.914e+11p ps=3.3e+06u
-M1003 VGND a_270_53# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1004 a_270_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.78e+11p pd=3.12e+06u as=0p ps=0u
-M1005 X a_270_53# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_270_53# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_270_53# a_79_137# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_528_27# D_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1009 a_360_367# B a_270_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.78e+11p pd=3.12e+06u as=0p ps=0u
-M1010 X a_270_53# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND C_N a_79_137# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1012 a_528_27# D_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1013 a_450_367# a_79_137# a_360_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR C_N a_79_137# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1015 VGND B a_270_53# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 X a_270_53# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 X a_270_53# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_528_27# a_270_53# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR a_270_53# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_270_367# B a_360_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND D_N a_528_27# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_79_137# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_450_367# a_528_27# a_270_53# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 X a_270_53# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND a_79_137# a_270_53# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR D_N a_528_27# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND a_270_53# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND A a_270_53# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 X a_270_53# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_270_53# a_528_27# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_360_367# a_79_137# a_450_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VPWR A a_270_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_79_137# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 X a_270_53# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VPWR a_270_53# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 VPWR a_270_53# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_270_53# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 VGND a_270_53# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 X a_270_53# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_lp.cdl b/cells/or4bb/sky130_fd_sc_lp__or4bb_lp.cdl
index 68d5b8f..335d336 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_lp.cdl
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_lp.cdl
@@ -16,46 +16,46 @@
 
 .SUBCKT sky130_fd_sc_lp__or4bb_lp 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 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR A 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
-MMP1 sndPA B VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP1 sndPA B 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
-MMP2 sndPB C VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP2 sndPB C 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
-MMP3 sndPC D VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMP3 sndPC D 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 C C_N VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIP2 C C_N 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
-MMIP3 D D_N VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MMIP3 D D_N 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
-MMIP4 X y 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
-MMN0 y 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
-MMN1 net157 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP4 X y 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
-MMN2 net153 C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN3 net149 D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 net157 B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN2 C C_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 net153 C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 net149 D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI12 y 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
-MI9 net160 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI11 y 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
-MI10 y 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
-MI13 net136 y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI8 net140 D_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI12 y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI7 net144 C_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 net160 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
+MI11 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI10 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI13 net136 y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI8 net140 D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net144 C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or4bb_lp
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_lp.netlist.tsv b/cells/or4bb/sky130_fd_sc_lp__or4bb_lp.netlist.tsv
index 1469d3e..739dc9a 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_lp.netlist.tsv
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_lp.netlist.tsv
@@ -1,23 +1,23 @@
 sky130_fd_sc_lp__or4bb_lp	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	net160	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	net157	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	net153	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	net149	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	net144	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	net140	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	net136	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	y	D	net149	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net160	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	y	C	net153	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	y	B	net157	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	net136	y	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net140	D_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net144	C_N	VGND	VNB	nshort	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	1	1	0.25	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.25	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	net160	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	net157	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	net153	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	net149	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN2	MOSFET	C	C_N	net144	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	D	D_N	net140	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	net136	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	y	D	net149	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net160	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	y	C	net153	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	y	B	net157	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	net136	y	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net140	D_N	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net144	C_N	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/or4bb/sky130_fd_sc_lp__or4bb_lp.spice b/cells/or4bb/sky130_fd_sc_lp__or4bb_lp.spice
index b77425d..4e70cd5 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_lp.spice
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_lp.spice
@@ -16,46 +16,25 @@
 
 
 .subckt sky130_fd_sc_lp__or4bb_lp A B C_N D_N VGND VNB VPB VPWR X
-M1000 a_318_409# C_N VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=5.8e+11p ps=5.16e+06u
-M1001 a_654_355# D_N VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1002 VGND a_86_21# a_116_47# VNB nshort w=420000u l=150000u
-+  ad=6.267e+11p pd=6.53e+06u as=8.82e+10p ps=1.26e+06u
-M1003 a_1284_47# D_N VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 a_86_21# a_654_355# a_823_125# VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=8.82e+10p ps=1.26e+06u
-M1005 VGND B a_981_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1006 a_654_355# D_N a_1284_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1007 a_981_125# B a_86_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND a_318_409# a_665_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1009 VPWR a_86_21# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1010 a_823_125# a_654_355# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1076_419# B a_505_400# VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=5.7e+11p ps=5.14e+06u
-M1012 a_116_47# a_86_21# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1013 a_86_21# A a_476_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.861e+11p ps=3.76e+06u
-M1014 a_612_400# a_318_409# a_505_400# VPB phighvt w=1e+06u l=250000u
-+  ad=2.1e+11p pd=2.42e+06u as=0p ps=0u
-M1015 a_274_47# C_N VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1016 a_665_125# a_318_409# a_86_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_318_409# C_N a_274_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1018 a_476_125# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_86_21# a_654_355# a_612_400# VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1020 VPWR A a_1076_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_274_47# C_N a_318_409# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_1284_47# D_N a_654_355# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_823_125# a_654_355# a_86_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR C_N a_318_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_505_400# B a_1076_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 VGND A a_476_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_116_47# a_86_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_505_400# a_318_409# a_612_400# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_1076_419# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 VPWR D_N a_654_355# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 X a_86_21# a_116_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND C_N a_274_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND a_654_355# a_823_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VGND D_N a_1284_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_476_125# A a_86_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_86_21# B a_981_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_665_125# a_318_409# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 X a_86_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X18 a_86_21# a_318_409# a_665_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_612_400# a_654_355# a_86_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X20 a_981_125# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_m.cdl b/cells/or4bb/sky130_fd_sc_lp__or4bb_m.cdl
index 5ff8128..62292ca 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_m.cdl
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_m.cdl
@@ -16,32 +16,32 @@
 
 .SUBCKT sky130_fd_sc_lp__or4bb_m 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMP0 VPWR 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
+MMP1 sndPA 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
+MMP2 sndPB C VPB pfet_01v8_hvt m=1 w=0.42 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=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 C C_N VPB pfet_01v8_hvt m=1 w=0.42 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.42 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=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 sndPA B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN0 y A VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP2 sndPB C VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN1 y B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMP3 sndPC D VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN2 y C VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP2 C C_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMN3 y D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP3 D D_N VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN2 C C_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMIP4 X y VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 D D_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MMN0 y 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
-MMN1 y 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
-MMN2 y 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
-MMN3 y 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
-MMIN2 C C_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN3 D D_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMIN4 X y VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN4 X y VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__or4bb_m
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_m.netlist.tsv b/cells/or4bb/sky130_fd_sc_lp__or4bb_m.netlist.tsv
index 38e2888..d4def80 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_m.netlist.tsv
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_m.netlist.tsv
@@ -1,16 +1,16 @@
 sky130_fd_sc_lp__or4bb_m	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	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP1	MOSFET	sndPA	B	sndPB	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP2	MOSFET	sndPB	C	sndPC	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMP3	MOSFET	sndPC	D	y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP2	MOSFET	C	C_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	D	D_N	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP4	MOSFET	X	y	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN0	MOSFET	y	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN1	MOSFET	y	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN2	MOSFET	y	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMN3	MOSFET	y	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN2	MOSFET	C	C_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	D	D_N	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN4	MOSFET	X	y	VGND	VNB	nshort	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP1	MOSFET	sndPA	B	sndPB	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP2	MOSFET	sndPB	C	sndPC	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMP3	MOSFET	sndPC	D	y	VPB	pfet_01v8_hvt	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP4	MOSFET	X	y	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN0	MOSFET	y	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN1	MOSFET	y	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN2	MOSFET	y	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMN3	MOSFET	y	D	VGND	VNB	nfet_01v8	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN4	MOSFET	X	y	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/or4bb/sky130_fd_sc_lp__or4bb_m.spice b/cells/or4bb/sky130_fd_sc_lp__or4bb_m.spice
index 73cca74..fbc0816 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_m.spice
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_m.spice
@@ -16,32 +16,18 @@
 
 
 .subckt sky130_fd_sc_lp__or4bb_m A B C_N D_N VGND VNB VPB VPWR X
-M1000 X a_336_439# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=2.961e+11p ps=3.09e+06u
-M1001 a_196_530# D_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=5.292e+11p ps=5.88e+06u
-M1002 a_336_439# a_196_530# VGND VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=0p ps=0u
-M1003 VGND A a_336_439# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_419_439# a_196_530# a_336_439# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1005 a_491_439# a_27_530# a_419_439# VPB phighvt w=420000u l=150000u
-+  ad=1.834e+11p pd=2.02e+06u as=0p ps=0u
-M1006 a_196_530# D_N VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1007 a_593_485# B a_491_439# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1008 VPWR A a_593_485# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_27_530# a_336_439# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND C_N a_27_530# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1011 VPWR C_N a_27_530# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1012 X a_336_439# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1013 a_336_439# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_530# C_N VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 VGND a_196_530# a_336_439# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_336_439# a_27_530# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_336_439# a_196_530# a_419_439# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 VGND B a_336_439# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_336_439# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_336_439# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_419_439# a_27_530# a_491_439# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VGND D_N a_196_530# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND a_336_439# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_27_530# C_N VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_491_439# B a_593_485# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 VPWR D_N a_196_530# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 a_593_485# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.cdl b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.cdl
index bbf6892..1181ad3 100644
--- a/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.cdl
+++ b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.cdl
@@ -17,100 +17,100 @@
 .SUBCKT sky130_fd_sc_lp__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 net93 D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI98 net93 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 net93 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.42 l=0.15 mult=1 sa=0.265
+MI120 net93 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.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.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI676 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI675 net116 SET_B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI675 net116 SET_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
-MI653 Q net273 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI677 M1 RESET VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M0 clkpos VNB nshort m=1 w=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.42 l=0.15 mult=1 sa=0.265
+MI653 Q net273 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 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
-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 net149 net177 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.64 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 net177 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net273 net177 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 net93 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.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.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI667 net164 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
-MI630 net177 RESET VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI649 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
-MI3 net177 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
-MI7 net176 SET_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
-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 net93 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 net93 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 net273 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net177 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
-MI670 net221 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 net268 RESET VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI654 net149 net177 VNB nfet_01v8 m=1 w=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 net229 net177 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI651 Q_N net177 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI664 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI652 net273 net177 VNB nfet_01v8 m=1 w=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 net93 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.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI667 net164 M1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI630 net177 RESET VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI3 net177 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
-MI10 net177 SET_B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI7 net176 SET_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
-MI11 net216 RESET VPB phighvt m=1 w=0.84 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 net245 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 net93 clkpos VPB phighvt m=1 w=0.42 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 net93 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=0.64 l=0.15 mult=1 sa=0.265
+MI101 net93 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=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
-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 net273 net177 VPB phighvt m=1 w=0.64 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 net177 VPB phighvt m=1 w=1.26 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 net273 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net177 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
+MI670 net221 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 net268 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 net229 net177 VPB pfet_01v8_hvt m=1 w=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 net177 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
+MI11 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
+MI650 net245 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 net93 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=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 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 pfet_01v8_hvt m=1 w=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 net273 net177 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 net177 VPB pfet_01v8_hvt m=1 w=1.26 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_lp__sdfbbn_1
diff --git a/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.netlist.tsv b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.netlist.tsv
index 89b2757..18c00e1 100644
--- a/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.netlist.tsv
+++ b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.netlist.tsv
@@ -1,50 +1,50 @@
 sky130_fd_sc_lp__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	net93	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	net93	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.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	net116	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	net116	SET_B	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net273	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	M1	RESET	net116	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M0	clkpos	net132	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	net132	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	net149	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net149	net177	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	net177	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net273	net177	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net93	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	net164	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI667	MOSFET	net164	M1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI630	MOSFET	net177	RESET	net176	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	net177	S0	net176	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net176	SET_B	VGND	VNB	nshort	1	0.64	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	net93	D	p0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	net93	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	net221	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net273	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net177	S0	net216	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net221	M1	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI678	MOSFET	net268	RESET	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net229	net177	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	S0	clkpos	net229	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net177	SET_B	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net216	RESET	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	net245	M1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net93	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	net245	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI680	MOSFET	M1	M0	net268	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net273	net177	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net177	VPWR	VPB	phighvt	1	1.26	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	net93	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	net93	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.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	net116	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI675	MOSFET	net116	SET_B	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net273	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	M1	RESET	net116	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M0	clkpos	net132	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	net132	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	net149	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net149	net177	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	net177	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net273	net177	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net93	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	net164	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI667	MOSFET	net164	M1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI630	MOSFET	net177	RESET	net176	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	net177	S0	net176	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net176	SET_B	VGND	VNB	nfet_01v8	1	0.64	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	net93	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	net93	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	net221	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net273	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net177	S0	net216	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net221	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	net268	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	net229	net177	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	net229	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net177	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	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
+MI650	MOSFET	net245	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	net93	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	net245	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	0.64	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI680	MOSFET	M1	M0	net268	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net273	net177	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net177	VPWR	VPB	pfet_01v8_hvt	1	1.26	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_lp__sdfbbn_1.spice b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.spice
index 719d29d..043ccd5 100644
--- a/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.spice
+++ b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.spice
@@ -17,100 +17,52 @@
 
 .subckt sky130_fd_sc_lp__sdfbbn_1 CLK_N D RESET_B SCD SCE SET_B VGND VNB VPB VPWR
 + Q Q_N
-M1000 a_1445_324# a_1295_379# a_1752_60# VNB nshort w=640000u l=150000u
-+  ad=3.70575e+11p pd=2.82e+06u as=3.648e+11p ps=3.7e+06u
-M1001 a_1996_379# a_1295_379# a_1445_324# VPB phighvt w=840000u l=150000u
-+  ad=2.016e+11p pd=2.16e+06u as=8.358e+11p ps=3.67e+06u
-M1002 VPWR a_2449_137# a_3279_367# VPB phighvt w=640000u l=150000u
-+  ad=3.7737e+12p pd=2.813e+07u as=1.824e+11p ps=1.85e+06u
-M1003 VPWR a_1926_21# a_1996_379# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 Q a_3279_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1005 a_1295_379# a_995_66# a_200_119# VNB nshort w=420000u l=150000u
-+  ad=2.6775e+11p pd=2.18e+06u as=2.961e+11p ps=3.09e+06u
-M1006 VGND RESET_B a_1926_21# VNB nshort w=420000u l=150000u
-+  ad=2.3603e+12p pd=1.951e+07u as=1.197e+11p ps=1.41e+06u
-M1007 a_314_119# D a_200_119# VNB nshort w=420000u l=150000u
-+  ad=2.058e+11p pd=1.82e+06u as=0p ps=0u
-M1008 a_1752_60# a_1926_21# a_1445_324# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_1445_324# a_1397_379# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1010 a_328_429# SCE VGND VNB nshort w=420000u l=150000u
-+  ad=1.533e+11p pd=1.57e+06u as=0p ps=0u
-M1011 a_2449_137# SET_B VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1012 a_200_119# SCE a_122_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1013 VGND a_328_429# a_314_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_2401_163# a_995_66# a_2299_119# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.139e+11p ps=2e+06u
-M1015 a_838_50# CLK_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1016 a_2299_119# a_838_50# a_2198_119# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.272e+11p ps=1.99e+06u
-M1017 a_2636_119# a_1926_21# a_2449_137# VNB nshort w=640000u l=150000u
-+  ad=5.3795e+11p pd=4.52e+06u as=3.5265e+11p ps=2.65e+06u
-M1018 VPWR a_838_50# a_995_66# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1019 VPWR RESET_B a_1926_21# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1020 Q_N a_2449_137# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1021 Q_N a_2449_137# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1022 a_2636_119# SET_B VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Q a_3279_367# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1024 VPWR SCD a_27_474# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.616e+11p ps=3.69e+06u
-M1025 VGND a_2449_137# a_2401_163# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_2401_506# a_838_50# a_2299_119# VPB phighvt w=420000u l=150000u
-+  ad=2.793e+11p pd=2.17e+06u as=2.6985e+11p ps=2.4e+06u
-M1027 a_2198_119# a_1445_324# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1439_104# a_838_50# a_1295_379# VNB nshort w=420000u l=150000u
-+  ad=1.764e+11p pd=1.68e+06u as=0p ps=0u
-M1029 a_838_50# CLK_N VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1030 a_1445_324# SET_B VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_27_474# a_328_429# a_200_119# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.968e+11p ps=3.24e+06u
-M1032 a_122_119# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1295_379# a_838_50# a_200_119# VPB phighvt w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1034 a_1397_379# a_995_66# a_1295_379# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1752_60# SET_B VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_2449_137# a_2299_119# a_2636_119# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR a_2449_137# a_2401_506# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_2299_119# a_995_66# a_2198_379# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=3.33725e+11p ps=2.88e+06u
-M1039 VGND a_838_50# a_995_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.239e+11p ps=1.43e+06u
-M1040 VGND a_1445_324# a_1439_104# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VGND a_2449_137# a_3279_367# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1042 a_200_474# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1043 a_2198_379# a_1445_324# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VPWR a_1926_21# a_2798_451# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=2.1e+06u
-M1045 a_2798_451# a_2299_119# a_2449_137# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_200_119# D a_200_474# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 a_328_429# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
+X0 a_27_474# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_1295_379# a_995_66# a_1397_379# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_2198_379# a_995_66# a_2299_119# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 VGND a_1445_324# a_2198_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_2198_119# a_838_50# a_2299_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_1439_104# a_1445_324# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR CLK_N a_838_50# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 a_995_66# a_838_50# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 a_200_119# a_328_429# a_27_474# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 VPWR SCE a_200_474# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X10 a_200_474# D a_200_119# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 VGND SET_B a_1752_60# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_1752_60# a_1295_379# a_1445_324# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 a_995_66# a_838_50# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VPWR a_2449_137# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_2299_119# a_995_66# a_2401_163# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_1445_324# a_1926_21# a_1752_60# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 VGND a_3279_367# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_1445_324# a_1295_379# a_1996_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X19 VGND SCD a_122_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_2636_119# a_2299_119# a_2449_137# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 a_2401_506# a_2449_137# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 a_1295_379# a_838_50# a_1439_104# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VGND SET_B a_2636_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X24 a_2449_137# a_2299_119# a_2798_451# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X25 VGND CLK_N a_838_50# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VPWR SET_B a_2449_137# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X27 a_2449_137# a_1926_21# a_2636_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X28 a_200_119# a_995_66# a_1295_379# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_3279_367# a_2449_137# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X30 a_1397_379# a_1445_324# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X31 VPWR SET_B a_1445_324# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X32 a_200_119# a_838_50# a_1295_379# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X33 a_122_119# SCE a_200_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 VPWR a_1445_324# a_2198_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X35 a_1996_379# a_1926_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X36 a_2798_451# a_1926_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X37 a_200_119# D a_314_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 a_2299_119# a_838_50# a_2401_506# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X39 a_314_119# a_328_429# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X40 VPWR a_3279_367# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X41 a_1926_21# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X42 a_1926_21# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X43 a_2401_163# a_2449_137# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X44 a_3279_367# a_2449_137# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X45 VPWR SCE a_328_429# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X46 VGND SCE a_328_429# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X47 VGND a_2449_137# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_2.cdl b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_2.cdl
index 1b0feb5..aa15c3f 100644
--- a/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_2.cdl
+++ b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_2.cdl
@@ -17,100 +17,100 @@
 .SUBCKT sky130_fd_sc_lp__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.42 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.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.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI676 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI675 net176 SET_B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI675 net176 SET_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
-MI653 Q net217 VNB nshort 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
-MI677 M1 RESET VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M0 clkpos VNB nshort m=1 w=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.42 l=0.15 mult=1 sa=0.265
+MI653 Q net217 VNB nfet_01v8 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 net164 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 net149 net125 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.64 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 net125 VNB nshort 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
-MI652 net217 net125 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 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.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.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI667 net136 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
-MI630 net125 RESET VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI649 net164 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 net125 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
-MI7 net124 SET_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
-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 net217 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI9 net125 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
-MI670 net269 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 net220 RESET VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI654 net149 net125 VNB nfet_01v8 m=1 w=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 net261 net125 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI651 Q_N net125 VNB nfet_01v8 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
-MI664 S0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI652 net217 net125 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net105 clkneg VNB nfet_01v8 m=1 w=0.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.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI667 net136 M1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI630 net125 RESET VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI3 net125 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
-MI10 net125 SET_B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI7 net124 SET_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
-MI11 net272 RESET VPB phighvt m=1 w=0.84 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 net245 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.42 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=0.64 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=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
-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 net217 net125 VPB phighvt m=1 w=0.64 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 net125 VPB phighvt m=2 w=1.26 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 net217 VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI9 net125 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
+MI670 net269 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 net220 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 net261 net125 VPB pfet_01v8_hvt m=1 w=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 net125 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
+MI11 net272 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
+MI650 net245 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.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=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 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 pfet_01v8_hvt m=1 w=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 net217 net125 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 net125 VPB pfet_01v8_hvt m=2 w=1.26 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_lp__sdfbbn_2
diff --git a/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_2.netlist.tsv b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_2.netlist.tsv
index a52e24a..f08d851 100644
--- a/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_2.netlist.tsv
+++ b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_2.netlist.tsv
@@ -1,50 +1,50 @@
 sky130_fd_sc_lp__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.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	net176	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	net176	SET_B	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net217	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	M1	RESET	net176	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M0	clkpos	net164	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	net164	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	net149	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net149	net125	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	net125	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net217	net125	VGND	VNB	nshort	1	0.42	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	net136	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI667	MOSFET	net136	M1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI630	MOSFET	net125	RESET	net124	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	net125	S0	net124	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net124	SET_B	VGND	VNB	nshort	1	0.64	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	net269	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net217	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net125	S0	net272	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net269	M1	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI678	MOSFET	net220	RESET	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net261	net125	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	S0	clkpos	net261	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net125	SET_B	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net272	RESET	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	net245	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M0	clkneg	net245	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK_N	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI680	MOSFET	M1	M0	net220	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net217	net125	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net125	VPWR	VPB	phighvt	2	1.26	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.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	net176	VNB	nfet_01v8	1	0.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net217	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	M1	RESET	net176	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M0	clkpos	net164	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	net164	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	net149	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net149	net125	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	net125	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net217	net125	VGND	VNB	nfet_01v8	1	0.42	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	net136	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI667	MOSFET	net136	M1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI630	MOSFET	net125	RESET	net124	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	net125	S0	net124	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net124	SET_B	VGND	VNB	nfet_01v8	1	0.64	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	net269	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net217	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net125	S0	net272	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net269	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	net220	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	net261	net125	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	net261	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net125	SET_B	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net272	RESET	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	net245	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M0	clkneg	net245	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	0.64	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI680	MOSFET	M1	M0	net220	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net217	net125	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net125	VPWR	VPB	pfet_01v8_hvt	2	1.26	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_lp__sdfbbn_2.spice b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_2.spice
index cd686d9..70d571e 100644
--- a/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_2.spice
+++ b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_2.spice
@@ -17,108 +17,56 @@
 
 .subckt sky130_fd_sc_lp__sdfbbn_2 CLK_N D RESET_B SCD SCE SET_B VGND VNB VPB VPWR
 + Q Q_N
-M1000 a_2714_451# a_2211_428# a_2415_137# VPB phighvt w=840000u l=150000u
-+  ad=2.016e+11p pd=2.16e+06u as=2.352e+11p ps=2.24e+06u
-M1001 VPWR a_2415_137# Q_N VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.4877e+12p pd=3.424e+07u as=3.528e+11p ps=3.08e+06u
-M1002 Q a_3289_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1003 Q a_3289_47# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=2.773e+12p ps=2.36e+07u
-M1004 VGND a_407_93# a_323_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=1.68e+06u
-M1005 VPWR a_1840_21# a_1796_379# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.016e+11p ps=2.16e+06u
-M1006 VPWR a_2415_137# a_3289_47# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1007 a_2367_163# a_978_67# a_2211_428# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.643e+11p ps=2.47e+06u
-M1008 VPWR a_840_95# a_978_67# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.4125e+11p ps=2.96e+06u
-M1009 a_2313_506# a_840_95# a_2211_428# VPB phighvt w=420000u l=150000u
-+  ad=2.919e+11p pd=2.23e+06u as=2.709e+11p ps=2.4e+06u
-M1010 VGND a_840_95# a_978_67# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.449e+11p ps=1.53e+06u
-M1011 a_1273_137# a_978_67# a_202_119# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=3.045e+11p ps=3.13e+06u
-M1012 VGND a_2415_137# Q_N VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1013 a_124_119# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1014 a_1670_93# a_1840_21# a_1423_401# VNB nshort w=640000u l=150000u
-+  ad=3.872e+11p pd=3.77e+06u as=2.985e+11p ps=2.42e+06u
-M1015 a_56_481# a_407_93# a_202_119# VPB phighvt w=640000u l=150000u
-+  ad=3.648e+11p pd=3.7e+06u as=3.822e+11p ps=3.5e+06u
-M1016 a_407_93# SCE VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1017 VGND a_1423_401# a_1359_137# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.953e+11p ps=1.77e+06u
-M1018 VPWR a_1423_401# a_1375_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1019 a_323_119# D a_202_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_2211_428# a_978_67# a_2116_379# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=3.15875e+11p ps=2.82e+06u
-M1021 a_1670_93# SET_B VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_2211_428# a_840_95# a_2116_119# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.304e+11p ps=2e+06u
-M1023 a_2415_137# SET_B VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Q_N a_2415_137# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_840_95# CLK_N VPWR VPB phighvt w=640000u l=150000u
-+  ad=2.784e+11p pd=2.15e+06u as=0p ps=0u
-M1026 VPWR a_1840_21# a_2714_451# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_3289_47# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_407_93# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1029 a_1423_401# a_1273_137# a_1670_93# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_2574_119# SET_B VGND VNB nshort w=640000u l=150000u
-+  ad=5.3795e+11p pd=4.52e+06u as=0p ps=0u
-M1031 a_2574_119# a_1840_21# a_2415_137# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.5e+11p ps=2.41e+06u
-M1032 VGND RESET_B a_1840_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1033 a_1796_379# a_1273_137# a_1423_401# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=2.52e+06u
-M1034 VPWR a_3289_47# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR a_2415_137# a_2313_506# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_202_119# SCE a_124_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND a_2415_137# a_2367_163# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND a_2415_137# a_3289_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1039 a_2116_379# a_1423_401# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VPWR RESET_B a_1840_21# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1041 Q_N a_2415_137# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_1273_137# a_840_95# a_202_119# VPB phighvt w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1043 a_1423_401# SET_B VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_1359_137# a_840_95# a_1273_137# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_1375_463# a_978_67# a_1273_137# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_2116_119# a_1423_401# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 a_2415_137# a_2211_428# a_2574_119# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 VPWR SCD a_56_481# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 a_840_95# CLK_N VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1050 a_245_481# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1051 a_202_119# D a_245_481# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_202_119# a_407_93# a_56_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_978_67# a_840_95# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_1273_137# a_978_67# a_1375_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VGND SCE a_407_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_1840_21# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_2714_451# a_1840_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 a_1273_137# a_840_95# a_1359_137# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_2574_119# a_2211_428# a_2415_137# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 VPWR SCE a_245_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 a_323_119# a_407_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_1840_21# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 VGND SET_B a_2574_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X12 a_124_119# SCE a_202_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_1670_93# a_1273_137# a_1423_401# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X14 VPWR SET_B a_2415_137# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X15 a_3289_47# a_2415_137# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_245_481# D a_202_119# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X17 a_978_67# a_840_95# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 a_2116_119# a_840_95# a_2211_428# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 VGND a_3289_47# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 VGND SET_B a_1670_93# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 VPWR a_2415_137# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 a_2211_428# a_978_67# a_2367_163# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 Q a_3289_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 a_1796_379# a_1840_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X25 a_202_119# a_978_67# a_1273_137# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VPWR SCE a_407_93# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X27 a_2211_428# a_840_95# a_2313_506# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 VGND a_1423_401# a_2116_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X29 a_2415_137# a_2211_428# a_2714_451# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X30 a_3289_47# a_2415_137# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X31 VGND a_2415_137# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X32 a_1375_463# a_1423_401# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X33 a_2313_506# a_2415_137# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X34 a_2415_137# a_1840_21# a_2574_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X35 VPWR CLK_N a_840_95# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X36 a_202_119# D a_323_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 a_2367_163# a_2415_137# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 VPWR a_3289_47# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X39 Q_N a_2415_137# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X40 VPWR SET_B a_1423_401# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X41 Q_N a_2415_137# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X42 a_202_119# a_840_95# a_1273_137# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X43 a_1359_137# a_1423_401# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X44 a_1423_401# a_1840_21# a_1670_93# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X45 a_1423_401# a_1273_137# a_1796_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X46 a_56_481# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X47 VPWR a_1423_401# a_2116_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X48 Q a_3289_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X49 VGND SCD a_124_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X50 a_2116_379# a_978_67# a_2211_428# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X51 VGND CLK_N a_840_95# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.cdl b/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.cdl
index b2cddca..ae53bb2 100644
--- a/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.cdl
+++ b/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.cdl
@@ -17,100 +17,100 @@
 .SUBCKT sky130_fd_sc_lp__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.42 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.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.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI676 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI675 net176 SET_B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI675 net176 SET_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
-MI653 Q net213 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI677 M1 RESET VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI648 M0 clkpos VNB nshort m=1 w=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI649 net160 M1 VNB nshort m=1 w=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.84 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.84 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.42 l=0.15 mult=1 sa=0.265
+MI677 M1 RESET VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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.64 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.64 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI630 net117 RESET VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI3 net117 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
-MI7 net116 SET_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
-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.26 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=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 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.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net213 net117 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI42 net105 clkneg VNB nfet_01v8 m=1 w=0.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.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI667 net128 M1 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI630 net117 RESET VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI3 net117 S0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI10 net117 SET_B VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI7 net116 SET_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
-MI11 net268 RESET VPB phighvt m=1 w=0.84 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.42 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=0.64 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=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.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
-MI661 Q_N net117 VPB phighvt m=1 w=1.26 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.26 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=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 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=0.84 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=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 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.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=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI45 clkneg CLK VPB pfet_01v8_hvt m=1 w=0.64 l=0.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.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 pfet_01v8_hvt m=1 w=1.26 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_lp__sdfbbp_1
diff --git a/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.netlist.tsv b/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.netlist.tsv
index 7063717..907507a 100644
--- a/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.netlist.tsv
+++ b/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.netlist.tsv
@@ -1,50 +1,50 @@
 sky130_fd_sc_lp__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.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	net176	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	net176	SET_B	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net213	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	M1	RESET	net176	VNB	nshort	1	0.64	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.42	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net213	net117	VGND	VNB	nshort	1	0.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI667	MOSFET	net128	M1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI630	MOSFET	net117	RESET	net116	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	net117	S0	net116	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net116	SET_B	VGND	VNB	nshort	1	0.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net117	S0	net268	VPB	phighvt	1	0.84	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	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net268	RESET	VPWR	VPB	phighvt	1	0.84	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.42	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net117	VPWR	VPB	phighvt	1	1.26	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.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	net176	VNB	nfet_01v8	1	0.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net213	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	M1	RESET	net176	VNB	nfet_01v8	1	0.64	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.42	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net213	net117	VGND	VNB	nfet_01v8	1	0.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI667	MOSFET	net128	M1	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI630	MOSFET	net117	RESET	net116	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	net117	S0	net116	VNB	nfet_01v8	1	0.64	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net117	S0	net268	VPB	pfet_01v8_hvt	1	0.84	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	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net268	RESET	VPWR	VPB	pfet_01v8_hvt	1	0.84	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.42	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	0.64	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.64	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.26	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_lp__sdfbbp_1.spice b/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.spice
index 66c2e4c..9e442b1 100644
--- a/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.spice
+++ b/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.spice
@@ -16,100 +16,52 @@
 
 
 .subckt sky130_fd_sc_lp__sdfbbp_1 CLK D RESET_B SCD SCE SET_B VNB VPB Q Q_N
-M1000 VPB RESET_B a_1650_21# w_n38_331# phighvt w=640000u l=150000u
-+  ad=3.03855e+12p pd=2.526e+07u as=1.824e+11p ps=1.85e+06u
-M1001 a_1297_290# a_1216_457# a_1492_47# w_0_0# nshort w=640000u l=150000u
-+  ad=2.304e+11p pd=2e+06u as=3.616e+11p ps=3.69e+06u
-M1002 VNB RESET_B a_1650_21# w_0_0# nshort w=420000u l=150000u
-+  ad=2.0847e+12p pd=1.831e+07u as=1.197e+11p ps=1.41e+06u
-M1003 VNB a_332_93# a_290_119# w_0_0# nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1004 a_1216_457# a_755_106# a_204_119# w_0_0# nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.373e+11p ps=2.81e+06u
-M1005 a_204_119# D a_224_481# w_n38_331# phighvt w=640000u l=150000u
-+  ad=2.989e+11p pd=3.25e+06u as=1.536e+11p ps=1.76e+06u
-M1006 a_755_106# CLK VPB w_n38_331# phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1007 a_1492_47# a_1650_21# a_1297_290# w_0_0# nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_1880_57# a_1297_290# VNB w_0_0# nshort w=640000u l=150000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1009 VNB a_2064_453# a_2066_101# w_0_0# nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1010 VNB a_1297_290# a_1318_47# w_0_0# nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1011 a_2279_57# SET_B VNB w_0_0# nshort w=640000u l=150000u
-+  ad=3.488e+11p pd=3.65e+06u as=0p ps=0u
-M1012 a_1216_457# a_893_101# a_204_119# w_n38_331# phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1013 a_204_119# SCE a_126_119# w_0_0# nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1014 VPB a_1650_21# a_2395_451# w_n38_331# phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.268e+11p ps=2.22e+06u
-M1015 a_755_106# CLK VNB w_0_0# nshort w=420000u l=150000u
-+  ad=1.764e+11p pd=1.68e+06u as=0p ps=0u
-M1016 VPB a_1297_290# a_1302_457# w_n38_331# phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1017 VPB a_2064_453# a_1963_515# w_n38_331# phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.121e+11p ps=1.85e+06u
-M1018 a_1861_431# a_893_101# a_1880_57# w_0_0# nshort w=640000u l=150000u
-+  ad=2.139e+11p pd=2e+06u as=0p ps=0u
-M1019 a_290_119# D a_204_119# w_0_0# nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_2064_453# SET_B VPB w_n38_331# phighvt w=840000u l=150000u
-+  ad=3.024e+11p pd=2.4e+06u as=0p ps=0u
-M1021 a_2395_451# a_1861_431# a_2064_453# w_n38_331# phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VNB a_755_106# a_893_101# w_0_0# nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1023 a_1318_47# a_893_101# a_1216_457# w_0_0# nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1584_373# a_1216_457# a_1297_290# w_n38_331# phighvt w=840000u l=150000u
-+  ad=2.772e+11p pd=2.34e+06u as=2.352e+11p ps=2.24e+06u
-M1025 VPB a_2064_453# a_2892_137# w_n38_331# phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1026 a_1492_47# SET_B VNB w_0_0# nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_2066_101# a_755_106# a_1861_431# w_0_0# nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_2064_453# a_1861_431# a_2279_57# w_0_0# nshort w=640000u l=150000u
-+  ad=4.795e+11p pd=3.46e+06u as=0p ps=0u
-M1029 a_1963_515# a_893_101# a_1861_431# w_n38_331# phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.709e+11p ps=2.4e+06u
-M1030 Q a_2892_137# VNB w_0_0# nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1031 a_1766_373# a_1297_290# VPB w_n38_331# phighvt w=840000u l=150000u
-+  ad=3.2375e+11p pd=2.91e+06u as=0p ps=0u
-M1032 a_224_481# SCE VPB w_n38_331# phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_126_119# SCD VNB w_0_0# nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_332_93# SCE VNB w_0_0# nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1035 a_1861_431# a_755_106# a_1766_373# w_n38_331# phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Q_N a_2064_453# VNB w_0_0# nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1037 VPB SCD a_27_481# w_n38_331# phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=4.16e+11p ps=3.86e+06u
-M1038 a_332_93# SCE VPB w_n38_331# phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1039 VNB a_2064_453# a_2892_137# w_0_0# nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1040 a_1297_290# SET_B VPB w_n38_331# phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_27_481# a_332_93# a_204_119# w_n38_331# phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VPB a_755_106# a_893_101# w_n38_331# phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1043 a_1302_457# a_755_106# a_1216_457# w_n38_331# phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 Q a_2892_137# VPB w_n38_331# phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1045 Q_N a_2064_453# VPB w_n38_331# phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1046 VPB a_1650_21# a_1584_373# w_n38_331# phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 a_2279_57# a_1650_21# a_2064_453# w_0_0# nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_290_119# a_332_93# VNB SUBS sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPB SET_B a_2064_453# w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 VNB a_2064_453# Q_N SUBS sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 a_204_119# a_755_106# a_1216_457# SUBS sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPB SCE a_224_481# w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_1302_457# a_1297_290# VPB w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_1650_21# RESET_B VNB SUBS sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPB a_2892_137# Q w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_204_119# D a_290_119# SUBS sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_27_481# SCD VPB w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X10 a_2395_451# a_1650_21# VPB w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X11 a_1318_47# a_1297_290# VNB SUBS sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VNB SET_B a_2279_57# SUBS sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 a_204_119# a_893_101# a_1216_457# w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 a_2279_57# a_1861_431# a_2064_453# SUBS sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 VNB SET_B a_1492_47# SUBS sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 VNB a_2892_137# Q SUBS sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_2064_453# a_1861_431# a_2395_451# w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X18 a_893_101# a_755_106# VNB SUBS sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_1650_21# RESET_B VPB w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 VPB SCE a_332_93# w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X21 VPB SET_B a_1297_290# w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X22 a_1963_515# a_2064_453# VPB w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X23 VNB CLK a_755_106# SUBS sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_1880_57# a_893_101# a_1861_431# SUBS sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X25 a_1297_290# a_1650_21# a_1492_47# SUBS sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X26 VPB CLK a_755_106# w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X27 a_1216_457# a_755_106# a_1302_457# w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 a_1766_373# a_755_106# a_1861_431# w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X29 VNB a_1297_290# a_1880_57# SUBS sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X30 a_1861_431# a_755_106# a_2066_101# SUBS sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 VNB SCD a_126_119# SUBS sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 a_1492_47# a_1216_457# a_1297_290# SUBS sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X33 a_2064_453# a_1650_21# a_2279_57# SUBS sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X34 a_893_101# a_755_106# VPB w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X35 a_1297_290# a_1216_457# a_1584_373# w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X36 VPB a_1297_290# a_1766_373# w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X37 a_2892_137# a_2064_453# VNB SUBS sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 a_204_119# a_332_93# a_27_481# w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X39 a_1584_373# a_1650_21# VPB w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X40 a_224_481# D a_204_119# w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X41 a_2892_137# a_2064_453# VPB w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X42 a_2066_101# a_2064_453# VNB SUBS sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X43 a_1216_457# a_893_101# a_1318_47# SUBS sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X44 a_126_119# SCE a_204_119# SUBS sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X45 VNB SCE a_332_93# SUBS sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X46 a_1861_431# a_893_101# a_1963_515# w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X47 VPB a_2064_453# Q_N w_n38_331# sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_1.cdl b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_1.cdl
index 26455c9..3013f4d 100644
--- a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_1.cdl
+++ b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_1.cdl
@@ -17,88 +17,88 @@
 .SUBCKT sky130_fd_sc_lp__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=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
-MI636 clkpos clkneg VNB nshort m=2 w=0.42 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK 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
-MI651 Q_N s0 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-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 net100 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 net134 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg 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
-MI33 net127 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.84 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 net115 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 net187 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
-MI653 Q net187 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net99 net100 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net100 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 net134 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net127 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.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 net115 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 s0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net187 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
+MI653 Q net187 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net99 net100 VNB nfet_01v8 m=1 w=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.26 l=0.15 mult=1 sa=0.265
+MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.26 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
-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 net215 net100 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI662 net215 net100 VPB pfet_01v8_hvt m=1 w=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 net100 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
-MI659 net100 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI658 net100 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
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI30 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
+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 net187 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
+MI660 Q net187 VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.84 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 net100 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 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
-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 net187 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
-MI660 Q net187 VPB phighvt m=1 w=1.26 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.26 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=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 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
-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_lp__sdfrbp_1
diff --git a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_1.netlist.tsv b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_1.netlist.tsv
index 7944457..e2a4a9b 100644
--- a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_1.netlist.tsv
+++ b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_1.netlist.tsv
@@ -1,44 +1,44 @@
 sky130_fd_sc_lp__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	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	2	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.84	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	net100	s0	net134	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net134	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net127	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	net115	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net115	M1	net127	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net99	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net187	s0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net187	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net99	net100	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.26	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	net215	net100	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net100	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	net215	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net100	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net194	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	net194	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	net187	s0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net187	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	s0	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	0.84	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	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	2	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.84	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	net100	s0	net134	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net134	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	net127	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	net115	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net115	M1	net127	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net99	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net187	s0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net187	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net99	net100	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.26	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.26	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	net215	net100	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net100	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	net215	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net100	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	net194	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	net194	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	net187	s0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net187	VPWR	VPB	pfet_01v8_hvt	1	1.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	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
+MI650	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
+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_lp__sdfrbp_1.spice b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_1.spice
index a824170..8430f5b 100644
--- a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_1.spice
+++ b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_1.spice
@@ -16,92 +16,48 @@
 
 
 .subckt sky130_fd_sc_lp__sdfrbp_1 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 VPWR SCE a_27_75# VPB phighvt w=640000u l=150000u
-+  ad=2.09568e+12p pd=1.945e+07u as=1.696e+11p ps=1.81e+06u
-M1001 VPWR CLK a_840_119# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1002 a_2002_42# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1003 a_1953_496# a_1024_367# a_1812_379# VPB phighvt w=420000u l=150000u
-+  ad=1.701e+11p pd=1.65e+06u as=3.6285e+11p ps=3.12e+06u
-M1004 a_1374_362# a_1246_463# VGND VNB nshort w=640000u l=150000u
-+  ad=4.578e+11p pd=3.02e+06u as=1.69955e+12p ps=1.505e+07u
-M1005 a_2002_42# a_1812_379# a_2138_68# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1006 a_1024_367# a_840_119# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1007 a_1332_463# a_840_119# a_1246_463# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.289e+11p ps=2.77e+06u
-M1008 VGND a_2352_327# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1009 a_453_491# a_27_75# a_367_491# VPB phighvt w=640000u l=150000u
-+  ad=2.208e+11p pd=1.97e+06u as=4.937e+11p ps=5.18e+06u
-M1010 a_1246_463# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_367_491# D a_300_75# VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=1.554e+11p ps=1.62e+06u
-M1012 a_1374_362# a_1246_463# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1013 a_1024_367# a_840_119# VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1014 VGND RESET_B a_1502_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1015 VGND CLK a_840_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1016 Q_N a_1812_379# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1017 VPWR SCD a_453_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND a_840_119# a_1024_367# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_2002_42# a_1960_68# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1020 a_295_491# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1021 VGND RESET_B a_217_75# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.583e+11p ps=2.91e+06u
-M1022 a_1246_463# a_1024_367# a_367_491# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_840_119# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1960_68# a_840_119# a_1812_379# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.395e+11p ps=2.08e+06u
-M1025 VPWR a_1812_379# a_2002_42# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1502_119# a_1374_362# a_1430_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1027 a_2138_68# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_367_491# D a_295_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_300_75# a_27_75# a_217_75# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_217_75# SCD a_488_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1031 a_1246_463# a_840_119# a_367_491# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1032 VPWR a_2002_42# a_1953_496# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1430_119# a_1024_367# a_1246_463# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Q_N a_1812_379# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1035 a_2352_327# a_1812_379# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1036 a_2352_327# a_1812_379# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1037 VPWR a_1374_362# a_1332_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_488_81# SCE a_367_491# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_2352_327# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1040 a_367_491# RESET_B VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_1812_379# a_840_119# a_1374_362# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VGND SCE a_27_75# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1043 a_1812_379# a_1024_367# a_1374_362# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_367_491# a_27_75# a_453_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 VGND a_1812_379# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_1953_496# a_2002_42# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_1024_367# a_840_119# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR RESET_B a_367_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 VGND CLK a_840_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_1812_379# a_1024_367# a_1953_496# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_453_491# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 a_1374_362# a_840_119# a_1812_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 a_300_75# D a_367_491# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_1246_463# a_1024_367# a_1430_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR a_840_119# a_1024_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VGND a_840_119# a_1024_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VGND a_1812_379# a_2352_327# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_1332_463# a_1374_362# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 VGND a_1246_463# a_1374_362# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 a_1374_362# a_1024_367# a_1812_379# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X17 a_217_75# a_27_75# a_300_75# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_840_119# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VPWR RESET_B a_2002_42# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 a_1502_119# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 Q a_2352_327# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 VPWR RESET_B a_1246_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X23 a_27_75# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X24 a_840_119# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 a_27_75# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_367_491# SCE a_488_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_367_491# a_1024_367# a_1246_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 a_1430_119# a_1374_362# a_1502_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_217_75# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_2002_42# a_1812_379# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X31 VPWR a_1812_379# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X32 a_2138_68# a_1812_379# a_2002_42# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 VPWR SCE a_295_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X34 a_295_491# D a_367_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X35 Q a_2352_327# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X36 a_1246_463# a_840_119# a_1332_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X37 VPWR a_1812_379# a_2352_327# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X38 a_1812_379# a_840_119# a_1960_68# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 VGND RESET_B a_2138_68# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X40 a_488_81# SCD a_217_75# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X41 VPWR a_1246_463# a_1374_362# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X42 a_367_491# a_840_119# a_1246_463# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X43 a_1960_68# a_2002_42# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_2.cdl b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_2.cdl
index bc06c48..909c73e 100644
--- a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_2.cdl
+++ b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_2.cdl
@@ -17,88 +17,88 @@
 .SUBCKT sky130_fd_sc_lp__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=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
-MI636 clkpos clkneg VNB nshort m=2 w=0.42 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK 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
-MI651 Q_N s0 VNB nshort 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
-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 net100 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 net134 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg 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
-MI33 net127 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.84 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 net115 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 net187 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
-MI653 Q net187 VNB nshort 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
-MI654 net110 net100 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net100 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 net134 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI33 net127 RESET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI634 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI4 M0 clkpos VNB nfet_01v8 m=1 w=0.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 net115 M1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI655 s0 clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net187 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
+MI653 Q net187 VNB nfet_01v8 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
+MI654 net110 net100 VNB nfet_01v8 m=1 w=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.26 l=0.15 mult=1 sa=0.265
+MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.26 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
-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 net215 net100 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI662 net215 net100 VPB pfet_01v8_hvt m=1 w=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 net100 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
-MI659 net100 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI658 net100 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
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI30 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
+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 net187 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
+MI660 Q net187 VPB pfet_01v8_hvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.84 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 net100 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 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
-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 net187 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
-MI660 Q net187 VPB phighvt m=2 w=1.26 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.26 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=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 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
-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_lp__sdfrbp_2
diff --git a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_2.netlist.tsv b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_2.netlist.tsv
index 2820711..9523181 100644
--- a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_2.netlist.tsv
+++ b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_2.netlist.tsv
@@ -1,44 +1,44 @@
 sky130_fd_sc_lp__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	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	s0	VGND	VNB	nshort	2	0.84	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	net100	s0	net134	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net134	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net127	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	net115	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net115	M1	net127	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
-MI652	MOSFET	net187	s0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net187	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net110	net100	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.26	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	net215	net100	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net100	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	net215	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net100	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net194	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	net194	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	net187	s0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net187	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	s0	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	0.84	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	2	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	2	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	2	0.84	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	net100	s0	net134	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net134	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	net127	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	net115	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net115	M1	net127	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
+MI652	MOSFET	net187	s0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net187	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net110	net100	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.26	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.26	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	net215	net100	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net100	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	net215	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net100	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	net194	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	net194	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	net187	s0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net187	VPWR	VPB	pfet_01v8_hvt	2	1.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	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
+MI650	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
+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_lp__sdfrbp_2.spice b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_2.spice
index 3e0f4d3..6010bfb 100644
--- a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_2.spice
+++ b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_2.spice
@@ -16,100 +16,52 @@
 
 
 .subckt sky130_fd_sc_lp__sdfrbp_2 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 VPWR a_1290_365# a_1248_463# VPB phighvt w=420000u l=150000u
-+  ad=3.0399e+12p pd=2.609e+07u as=8.82e+10p ps=1.26e+06u
-M1001 VPWR a_1923_174# a_1885_496# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.638e+11p ps=1.62e+06u
-M1002 a_359_489# RESET_B VPWR VPB phighvt w=640000u l=150000u
-+  ad=4.706e+11p pd=5.07e+06u as=0p ps=0u
-M1003 VGND a_1770_412# Q_N VNB nshort w=840000u l=150000u
-+  ad=2.00595e+12p pd=1.952e+07u as=2.352e+11p ps=2.24e+06u
-M1004 a_287_489# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1005 a_1290_365# a_1162_463# VGND VNB nshort w=640000u l=150000u
-+  ad=4.683e+11p pd=3.02e+06u as=0p ps=0u
-M1006 VGND a_2516_367# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1007 Q_N a_1770_412# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1008 VPWR a_2516_367# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1009 a_359_489# D a_287_489# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1770_412# a_759_119# a_1290_365# VPB phighvt w=840000u l=150000u
-+  ad=2.898e+11p pd=2.53e+06u as=3.85875e+11p ps=2.86e+06u
-M1011 a_2516_367# a_1770_412# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1012 a_1923_174# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1013 a_934_367# a_759_119# VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1014 VGND SCE a_27_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1015 VGND RESET_B a_240_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.289e+11p ps=2.77e+06u
-M1016 a_2067_68# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1017 a_934_367# a_759_119# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1018 a_1162_463# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=0p ps=0u
-M1019 a_759_119# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1020 a_1923_174# a_1770_412# a_2067_68# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1021 VPWR SCE a_27_81# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1022 VGND CLK a_759_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1248_463# a_759_119# a_1162_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_486_81# SCE a_359_489# VNB nshort w=420000u l=150000u
-+  ad=1.239e+11p pd=1.43e+06u as=2.394e+11p ps=2.82e+06u
-M1025 VGND RESET_B a_1421_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1026 Q a_2516_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_759_119# a_934_367# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1349_119# a_934_367# a_1162_463# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1029 a_2516_367# a_1770_412# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1030 Q a_2516_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1290_365# a_1162_463# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1885_496# a_934_367# a_1770_412# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_323_81# a_27_81# a_240_81# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1034 VPWR SCD a_445_489# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.048e+11p ps=1.92e+06u
-M1035 a_359_489# D a_323_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1421_119# a_1290_365# a_1349_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Q_N a_1770_412# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1162_463# a_934_367# a_359_489# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_1770_412# Q_N VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_1879_68# a_759_119# a_1770_412# VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=2.075e+11p ps=1.98e+06u
-M1041 a_445_489# a_27_81# a_359_489# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VPWR CLK a_759_119# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1043 a_1162_463# a_759_119# a_359_489# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VGND a_1923_174# a_1879_68# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VPWR a_1770_412# a_1923_174# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 a_1770_412# a_934_367# a_1290_365# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 a_240_81# SCD a_486_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1162_463# a_934_367# a_1349_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_759_119# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VGND a_759_119# a_934_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND a_1770_412# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND a_1770_412# a_2516_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 Q_N a_1770_412# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_359_489# SCE a_486_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 Q_N a_1770_412# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VPWR RESET_B a_1923_174# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_759_119# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_1879_68# a_1923_174# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_359_489# a_27_81# a_445_489# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 a_486_81# SCD a_240_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_359_489# a_759_119# a_1162_463# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_1885_496# a_1923_174# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 a_240_81# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_1770_412# a_759_119# a_1879_68# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_27_81# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VPWR a_759_119# a_934_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 VGND a_2516_367# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 a_1770_412# a_934_367# a_1885_496# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 a_1248_463# a_1290_365# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 a_1923_174# a_1770_412# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X23 VPWR a_1162_463# a_1290_365# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X24 a_1290_365# a_759_119# a_1770_412# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X25 a_323_81# D a_359_489# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VPWR a_1770_412# a_2516_367# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X27 a_2067_68# a_1770_412# a_1923_174# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 VPWR RESET_B a_1162_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X29 a_1162_463# a_759_119# a_1248_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X30 a_1290_365# a_934_367# a_1770_412# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X31 Q a_2516_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X32 a_359_489# a_934_367# a_1162_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X33 Q a_2516_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X34 a_1421_119# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 VPWR a_2516_367# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X36 VPWR RESET_B a_359_489# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X37 VPWR a_1770_412# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X38 a_445_489# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X39 VGND CLK a_759_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X40 a_240_81# a_27_81# a_323_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X41 a_934_367# a_759_119# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X42 a_1349_119# a_1290_365# a_1421_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X43 VGND a_1162_463# a_1290_365# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X44 VPWR SCE a_287_489# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X45 a_287_489# D a_359_489# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X46 VGND RESET_B a_2067_68# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X47 a_27_81# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.cdl b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.cdl
index 0d89b69..199e03b 100644
--- a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.cdl
+++ b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.cdl
@@ -17,124 +17,124 @@
 .SUBCKT sky130_fd_sc_lp__sdfrbp_lp 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
-MI691 net0203 net041 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI691 net0203 net041 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI690 net0200 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
-MI693 net0191 s0 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI685 net0228 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
-MI651 Q_N s0 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-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 net062 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 net048 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI690 net0200 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
-MI33 net069 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI693 net0191 s0 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 net0251 SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI685 net0228 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
-MI634 sceb SCE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI651 Q_N s0 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-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 net077 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 net041 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
-MI653 Q net041 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net061 net062 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
-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
-MI649 M1 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
-MI676 net0232 CLK VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI656 net062 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
-MI675 clkneg CLK VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net048 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 net069 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
+MI669 net0251 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
+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
-MI673 clkpos clkneg VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI34 net077 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
-MI674 net0239 clkneg VNB nshort 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
-MI666 net84 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI652 net041 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
+MI653 Q net041 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net061 net062 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI676 net0232 CLK VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI675 clkneg CLK VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI673 clkpos clkneg VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI674 net0239 clkneg VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI666 net84 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
-MI670 net0371 SCE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI670 net0371 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
-MI687 net0335 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI687 net0335 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
+MI682 net0352 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
+MI686 net0331 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
-MI682 net0352 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI692 net0303 s0 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI686 net0331 s0 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
-MI692 net0303 s0 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MI662 net0133 net062 VPB pfet_01v8_hvt m=1 w=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 net062 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
+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
-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 net0133 net062 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+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
-MI659 net062 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI658 net062 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
-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
-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
-MI658 net062 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 net0156 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 net041 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
-MI660 Q net041 VPB phighvt m=1 w=1.26 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.26 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=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 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
-MI689 net0308 net041 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MI30 net0156 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
-MI688 net0312 s0 VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+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
-MI684 net0348 M0 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+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
-MI680 clkneg CLK VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MI663 net041 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
-MI679 clkpos clkneg VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MI660 Q net041 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI678 net0359 clkneg VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MI661 Q_N s0 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI677 net0368 CLK VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MI648 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
-MI683 db RESET_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI650 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
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI689 net0308 net041 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI688 net0312 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
+MI684 net0348 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
+MI680 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI679 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI678 net0359 clkneg VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI677 net0368 CLK VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI683 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
+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
-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 net0408 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 net0408 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_lp__sdfrbp_lp
diff --git a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.netlist.tsv b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.netlist.tsv
index 54997a6..995327c 100644
--- a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.netlist.tsv
+++ b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.netlist.tsv
@@ -1,62 +1,62 @@
 sky130_fd_sc_lp__sdfrbp_lp	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
-MI691	MOSFET	net0203	net041	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI690	MOSFET	net0200	s0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI693	MOSFET	net0191	s0	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI685	MOSFET	net0228	M0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	s0	net0191	VNB	nshort	1	0.84	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	net062	s0	net048	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net048	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net069	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	net0251	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	sceb	SCE	net0251	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net077	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net077	M1	net069	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net061	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net041	s0	net0200	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net041	net0203	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net061	net062	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	net0228	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
-MI676	MOSFET	net0232	CLK	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	clkneg	CLK	net0232	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI673	MOSFET	clkpos	clkneg	net0239	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI674	MOSFET	net0239	clkneg	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	net84	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	net84	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	net84	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI670	MOSFET	net0371	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI687	MOSFET	net0335	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI682	MOSFET	net0352	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI686	MOSFET	net0331	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI692	MOSFET	net0303	s0	VPWR	VPB	phighvt	1	1.26	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	net0133	net062	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net062	RESET_B	net0335	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	sceb	SCE	net0371	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net0133	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net062	s0	net0331	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net0156	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	net0156	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	net0352	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net041	s0	net0312	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net041	net0308	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	s0	net0303	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	net0348	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI689	MOSFET	net0308	net041	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI688	MOSFET	net0312	s0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI684	MOSFET	net0348	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI680	MOSFET	clkneg	CLK	net0368	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI679	MOSFET	clkpos	clkneg	net0359	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI678	MOSFET	net0359	clkneg	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	net0368	CLK	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI683	MOSFET	db	RESET_B	net0408	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	net0408	RESET_B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI691	MOSFET	net0203	net041	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI690	MOSFET	net0200	s0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI693	MOSFET	net0191	s0	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI685	MOSFET	net0228	M0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q_N	s0	net0191	VNB	nfet_01v8	1	0.84	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	net062	s0	net048	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net048	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	net069	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	net0251	SCE	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	net0251	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net077	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net077	M1	net069	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net061	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net041	s0	net0200	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net041	net0203	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net061	net062	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	net0228	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
+MI676	MOSFET	net0232	CLK	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI675	MOSFET	clkneg	CLK	net0232	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI673	MOSFET	clkpos	clkneg	net0239	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI674	MOSFET	net0239	clkneg	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	net84	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	net84	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	net84	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI670	MOSFET	net0371	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI687	MOSFET	net0335	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI682	MOSFET	net0352	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI686	MOSFET	net0331	s0	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI692	MOSFET	net0303	s0	VPWR	VPB	pfet_01v8_hvt	1	1.26	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	net0133	net062	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net062	RESET_B	net0335	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	sceb	SCE	net0371	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net0133	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net062	s0	net0331	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net0156	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	net0156	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	net0352	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net041	s0	net0312	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net041	net0308	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	s0	net0303	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	net0348	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	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
+MI689	MOSFET	net0308	net041	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI688	MOSFET	net0312	s0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI684	MOSFET	net0348	M0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI680	MOSFET	clkneg	CLK	net0368	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI679	MOSFET	clkpos	clkneg	net0359	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI678	MOSFET	net0359	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	net0368	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI683	MOSFET	db	RESET_B	net0408	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	net0408	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_lp__sdfrbp_lp.spice b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.spice
index b74b9de..43c25e4 100644
--- a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.spice
+++ b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.spice
@@ -16,124 +16,64 @@
 
 
 .subckt sky130_fd_sc_lp__sdfrbp_lp CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 a_1661_87# a_911_219# a_1147_490# VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=4.16e+11p ps=3.86e+06u
-M1001 VGND a_2168_439# a_3503_137# VNB nshort w=420000u l=150000u
-+  ad=2.0659e+12p pd=1.664e+07u as=8.82e+10p ps=1.26e+06u
-M1002 a_1673_375# a_911_219# a_1147_490# VPB phighvt w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=4.788e+11p ps=4.5e+06u
-M1003 VPWR a_1147_490# a_1020_491# VPB phighvt w=420000u l=150000u
-+  ad=2.6799e+12p pd=2.027e+07u as=3.657e+11p ps=2.55e+06u
-M1004 a_500_261# a_29_47# a_428_261# VNB nshort w=420000u l=150000u
-+  ad=2.373e+11p pd=2.81e+06u as=8.82e+10p ps=1.26e+06u
-M1005 VGND RESET_B a_1303_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1006 a_911_219# a_876_93# a_342_261# VPB phighvt w=420000u l=150000u
-+  ad=2.856e+11p pd=3.04e+06u as=3.803e+11p ps=3.8e+06u
-M1007 Q_N a_2168_439# a_3233_357# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=2.646e+11p ps=2.94e+06u
-M1008 a_342_261# SCE a_255_261# VNB nshort w=420000u l=150000u
-+  ad=3.9e+11p pd=3.76e+06u as=2.394e+11p ps=2.82e+06u
-M1009 VPWR a_911_219# a_1673_375# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_876_93# a_967_193# a_1880_47# VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=2.016e+11p ps=2.16e+06u
-M1011 VGND a_2388_115# a_2340_141# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1012 a_3684_53# a_3416_137# VGND VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1013 a_342_491# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1014 a_342_261# D a_342_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_342_261# a_967_193# a_911_219# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1016 VPWR SCE a_125_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.7e+06u
-M1017 VGND SCE a_116_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1018 VPWR a_2388_115# a_2081_439# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.82e+06u
-M1019 a_2523_397# a_2168_439# VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.394e+11p pd=2.82e+06u as=0p ps=0u
-M1020 Q a_3416_137# a_3684_53# VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1021 VGND a_911_219# a_1661_87# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_3503_137# a_2168_439# a_3416_137# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1023 VPWR SCD a_506_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1024 a_125_491# SCE a_29_47# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1025 a_1870_367# a_967_193# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1026 a_3075_47# CLK a_967_193# VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=2.394e+11p ps=2.25e+06u
-M1027 VGND CLK a_3075_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1020_491# a_967_193# a_911_219# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_876_93# a_967_193# a_1870_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1030 a_1303_119# a_1147_490# a_824_219# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.82e+06u
-M1031 Q_N a_2168_439# a_3233_47# VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=1.764e+11p ps=2.1e+06u
-M1032 a_911_219# a_876_93# a_824_219# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_3233_357# a_2168_439# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_3503_367# a_2168_439# a_3416_137# VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=1.824e+11p ps=1.85e+06u
-M1035 a_2388_115# a_2168_439# a_2682_141# VNB nshort w=420000u l=150000u
-+  ad=1.68e+11p pd=1.64e+06u as=1.008e+11p ps=1.32e+06u
-M1036 VPWR RESET_B a_2719_518# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1037 a_2388_115# a_2168_439# a_2523_397# VPB phighvt w=420000u l=150000u
-+  ad=2.77825e+11p pd=2.84e+06u as=0p ps=0u
-M1038 a_2719_518# RESET_B a_2388_115# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR a_2168_439# a_3503_367# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_116_47# SCE a_29_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1041 a_500_261# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_1147_490# a_967_193# a_2168_439# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.856e+11p ps=2.47e+06u
-M1043 a_1375_535# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1044 a_2168_439# a_876_93# a_2081_439# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_2340_141# a_967_193# a_2168_439# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.286e+11p ps=2.07e+06u
-M1046 a_3233_47# a_2168_439# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 a_735_491# RESET_B VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1048 a_342_261# RESET_B a_735_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 a_911_219# RESET_B a_1375_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 a_255_261# SCD a_500_261# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 a_2168_439# a_876_93# a_1147_490# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 a_3075_357# CLK a_967_193# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=3.591e+11p ps=3.09e+06u
-M1053 a_3684_367# a_3416_137# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.646e+11p pd=2.94e+06u as=0p ps=0u
-M1054 a_2682_141# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1055 VPWR CLK a_3075_357# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1056 a_506_491# a_29_47# a_342_261# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1057 a_1880_47# a_967_193# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1058 Q a_3416_137# a_3684_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1059 a_428_261# D a_342_261# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_2388_115# RESET_B a_2719_518# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_342_261# a_29_47# a_506_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_911_219# a_967_193# a_342_261# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_342_491# D a_342_261# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 a_2081_439# a_2388_115# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_2682_141# a_2168_439# a_2388_115# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_2340_141# a_2388_115# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_3684_53# a_3416_137# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_255_261# SCE a_342_261# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_1303_119# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VPWR a_2168_439# a_3233_357# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_3075_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VGND a_2168_439# a_3233_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VPWR RESET_B a_735_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 VPWR a_2168_439# a_2523_397# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 a_2719_518# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 a_824_219# a_876_93# a_911_219# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_3233_47# a_2168_439# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_735_491# RESET_B a_342_261# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 a_2168_439# a_967_193# a_1147_490# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X20 a_1661_87# a_911_219# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 a_911_219# a_967_193# a_1020_491# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 a_116_47# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_3503_137# a_2168_439# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_342_261# a_876_93# a_911_219# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X25 a_1020_491# a_1147_490# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X26 a_342_261# D a_428_261# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_29_47# SCE a_116_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_2523_397# a_2168_439# a_2388_115# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X29 a_1147_490# a_911_219# a_1661_87# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X30 a_1147_490# a_876_93# a_2168_439# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X31 VGND a_3416_137# a_3684_53# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X32 a_967_193# CLK a_3075_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X33 a_500_261# SCD a_255_261# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_125_491# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X35 a_506_491# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X36 a_3416_137# a_2168_439# a_3503_137# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 a_1880_47# a_967_193# a_876_93# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X38 VPWR a_3416_137# a_3684_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X39 a_3684_367# a_3416_137# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X40 a_1147_490# a_911_219# a_1673_375# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X41 a_1673_375# a_911_219# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X42 a_3233_357# a_2168_439# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X43 a_3416_137# a_2168_439# a_3503_367# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X44 a_3503_367# a_2168_439# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X45 a_29_47# SCE a_125_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X46 VGND a_967_193# a_1880_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X47 a_428_261# a_29_47# a_500_261# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X48 VPWR RESET_B a_1375_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X49 a_1375_535# RESET_B a_911_219# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X50 VGND RESET_B a_2682_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X51 a_2081_439# a_876_93# a_2168_439# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X52 a_967_193# CLK a_3075_357# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X53 a_3075_357# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X54 a_2168_439# a_967_193# a_2340_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X55 VPWR a_967_193# a_1870_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X56 VGND RESET_B a_500_261# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X57 a_824_219# a_1147_490# a_1303_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X58 VPWR SCE a_342_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X59 a_1870_367# a_967_193# a_876_93# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_1.cdl b/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_1.cdl
index 69f230f..ba35383 100644
--- a/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_1.cdl
+++ b/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_1.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265
+MI642 clkpos CLK_N VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI636 clkneg clkpos VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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 net062 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 net048 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 net069 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net062 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 net077 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 net041 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
-MI653 Q net041 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net061 net062 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net048 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 net069 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 net077 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 net041 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
+MI653 Q net041 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net061 net062 VNB nfet_01v8 m=1 w=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 net84 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 net84 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.26 l=0.15 mult=1 sa=0.265
+MI643 clkpos CLK_N VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265
+MI635 clkneg clkpos VPB pfet_01v8_hvt m=1 w=1.26 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
-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 net0133 net062 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI662 net0133 net062 VPB pfet_01v8_hvt m=1 w=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 net062 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
-MI659 net062 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI658 net062 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
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI30 net0156 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 net041 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
+MI660 Q net041 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.84 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 net062 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 net0156 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 net041 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
-MI660 Q net041 VPB phighvt m=1 w=1.26 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=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 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
-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_lp__sdfrtn_1
diff --git a/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_1.netlist.tsv b/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_1.netlist.tsv
index 624e69a..dcbefff 100644
--- a/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_1.netlist.tsv
+++ b/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_1.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.84	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	net062	s0	net048	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net048	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net069	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	net077	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net077	M1	net069	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net061	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net041	s0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net041	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net061	net062	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	net84	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	net84	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	net84	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	1.26	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	net0133	net062	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net062	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	net0133	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net062	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net0156	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	net0156	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	net041	s0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net041	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.84	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	net062	s0	net048	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net048	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	net069	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	net077	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net077	M1	net069	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net061	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net041	s0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net041	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net061	net062	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	net84	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	net84	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	net84	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.26	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.26	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	net0133	net062	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net062	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	net0133	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net062	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	net0156	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	net0156	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	net041	s0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net041	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	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
+MI650	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
+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_lp__sdfrtn_1.spice b/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_1.spice
index 03c9c0e..0811273 100644
--- a/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_1.spice
+++ b/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_1.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__sdfrtn_1 CLK_N D RESET_B SCD SCE VGND VNB VPB VPWR Q
-M1000 VPWR RESET_B a_229_491# VPB phighvt w=640000u l=150000u
-+  ad=2.7924e+12p pd=2.209e+07u as=5.389e+11p ps=5.28e+06u
-M1001 a_1406_399# a_1278_529# VGND VNB nshort w=640000u l=150000u
-+  ad=3.2785e+11p pd=2.31e+06u as=1.64372e+12p ps=1.392e+07u
-M1002 a_2226_127# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1003 a_1278_529# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=0p ps=0u
-M1004 VPWR a_1870_127# a_2370_351# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1005 a_1278_529# a_857_367# a_229_491# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_1870_127# a_1080_47# a_1406_399# VPB phighvt w=840000u l=150000u
-+  ad=2.688e+11p pd=2.43e+06u as=2.352e+11p ps=2.24e+06u
-M1007 a_1509_127# a_1406_399# a_1437_127# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=8.82e+10p ps=1.26e+06u
-M1008 a_1437_127# a_857_367# a_1278_529# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1009 VGND RESET_B a_1509_127# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_565_59# D a_229_491# VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=4.708e+11p ps=3.99e+06u
-M1011 VGND a_1870_127# a_2370_351# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1012 VPWR a_2064_101# a_2022_533# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1013 VPWR a_1870_127# a_2064_101# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1014 a_562_491# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1015 a_278_59# a_113_63# a_565_59# VNB nshort w=420000u l=150000u
-+  ad=2.751e+11p pd=2.99e+06u as=0p ps=0u
-M1016 a_1870_127# a_857_367# a_1406_399# VNB nshort w=640000u l=150000u
-+  ad=3.662e+11p pd=2.5e+06u as=0p ps=0u
-M1017 a_2022_127# a_1080_47# a_1870_127# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1018 a_229_491# D a_562_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1080_47# a_857_367# VGND VNB nshort w=840000u l=150000u
-+  ad=3.679e+11p pd=2.7e+06u as=0p ps=0u
-M1020 a_1278_529# a_1080_47# a_229_491# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_113_63# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1022 a_1080_47# a_857_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1023 a_857_367# CLK_N VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1024 a_2022_533# a_857_367# a_1870_127# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 Q a_2370_351# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1026 a_361_59# SCD a_278_59# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1027 a_1364_529# a_1080_47# a_1278_529# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1028 a_229_491# SCE a_361_59# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND a_2064_101# a_2022_127# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_2064_101# a_1870_127# a_2226_127# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1031 Q a_2370_351# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1032 a_312_491# a_113_63# a_229_491# VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1033 a_2064_101# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND RESET_B a_278_59# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_857_367# CLK_N VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1036 VPWR a_1406_399# a_1364_529# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR SCD a_312_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1406_399# a_1278_529# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_113_63# SCE VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 a_562_491# D a_229_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_278_59# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_1437_127# a_1406_399# a_1509_127# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_229_491# D a_565_59# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_2022_533# a_2064_101# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VGND a_1278_529# a_1406_399# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 a_229_491# a_113_63# a_312_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 a_312_491# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 VGND RESET_B a_2226_127# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_2370_351# a_1870_127# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X10 a_1870_127# a_857_367# a_2022_533# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_2022_127# a_2064_101# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_229_491# a_857_367# a_1278_529# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 VPWR RESET_B a_1278_529# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 VGND CLK_N a_857_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_1509_127# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VGND a_857_367# a_1080_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 VPWR a_1278_529# a_1406_399# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X18 a_2064_101# a_1870_127# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 VPWR SCE a_113_63# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 VPWR RESET_B a_2064_101# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 a_1406_399# a_857_367# a_1870_127# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 a_361_59# SCE a_229_491# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_1278_529# a_1080_47# a_1364_529# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X24 a_1364_529# a_1406_399# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X25 a_2370_351# a_1870_127# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_1278_529# a_857_367# a_1437_127# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 VPWR a_2370_351# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X28 a_1870_127# a_1080_47# a_2022_127# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 VPWR CLK_N a_857_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X30 VGND a_2370_351# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X31 a_229_491# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X32 a_1406_399# a_1080_47# a_1870_127# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X33 VPWR a_857_367# a_1080_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X34 VGND SCE a_113_63# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 a_278_59# SCD a_361_59# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 a_565_59# a_113_63# a_278_59# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 a_229_491# a_1080_47# a_1278_529# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 VPWR SCE a_562_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X39 a_2226_127# a_1870_127# a_2064_101# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_1.cdl b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_1.cdl
index 1966536..f96bb19 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_1.cdl
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_1.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_lp__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.84 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.84 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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 net062 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 net048 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.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net069 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 net077 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 net041 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
-MI653 Q net041 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net061 net062 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net062 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 net048 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 net069 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 net077 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 net041 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
+MI653 Q net041 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net061 net062 VNB nfet_01v8 m=1 w=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 net84 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 net84 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.26 l=0.15 mult=1 sa=0.265
+MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.26 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
-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 net0133 net062 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI662 net0133 net062 VPB pfet_01v8_hvt m=1 w=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 net062 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
-MI659 net062 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI658 net062 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
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI30 net0156 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 net041 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
+MI660 Q net041 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.84 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 net062 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 net0156 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 net041 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
-MI660 Q net041 VPB phighvt m=1 w=1.26 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=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 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
-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_lp__sdfrtp_1
diff --git a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_1.netlist.tsv b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_1.netlist.tsv
index d528272..d56b03b 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_1.netlist.tsv
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_1.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.84	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	net062	s0	net048	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net048	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net069	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	net077	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net077	M1	net069	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net061	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net041	s0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net041	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net061	net062	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	net84	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	net84	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	net84	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.26	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	net0133	net062	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net062	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	net0133	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net062	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net0156	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	net0156	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	net041	s0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net041	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.84	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	net062	s0	net048	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net048	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	net069	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	net077	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net077	M1	net069	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net061	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net041	s0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net041	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net061	net062	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	net84	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	net84	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	net84	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.26	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.26	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	net0133	net062	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net062	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	net0133	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net062	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	net0156	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	net0156	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	net041	s0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net041	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	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
+MI650	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
+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_lp__sdfrtp_1.spice b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_1.spice
index 619e1ad..2dd63c4 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_1.spice
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_1.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__sdfrtp_1 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
-M1000 a_225_50# SCD a_512_81# VNB nshort w=420000u l=150000u
-+  ad=2.478e+11p pd=2.86e+06u as=8.82e+10p ps=1.26e+06u
-M1001 a_355_463# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=2.32525e+12p ps=1.854e+07u
-M1002 VPWR a_937_333# a_895_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1003 VPWR a_1445_69# a_2408_367# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1004 a_1445_69# a_757_317# a_937_333# VNB nshort w=640000u l=150000u
-+  ad=3.187e+11p pd=2.52e+06u as=3.04e+11p ps=2.23e+06u
-M1005 a_1818_119# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.4522e+12p ps=1.244e+07u
-M1006 a_308_50# a_35_74# a_225_50# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1007 a_865_255# CLK VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1008 VPWR SCD a_513_463# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.048e+11p ps=1.92e+06u
-M1009 a_1641_21# a_1445_69# a_1818_119# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1010 VGND a_865_255# a_757_317# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.25e+06u
-M1011 a_1085_119# a_937_333# a_991_119# VNB nshort w=420000u l=150000u
-+  ad=1.554e+11p pd=1.62e+06u as=1.344e+11p ps=1.48e+06u
-M1012 a_1599_113# a_865_255# a_1445_69# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1013 a_809_463# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=0p ps=0u
-M1014 VPWR a_1445_69# a_1641_21# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1015 a_513_463# a_35_74# a_380_50# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.95e+11p ps=3.87e+06u
-M1016 Q a_2408_367# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1017 a_1445_69# a_865_255# a_937_333# VPB phighvt w=840000u l=150000u
-+  ad=4.361e+11p pd=3.32e+06u as=2.352e+11p ps=2.24e+06u
-M1018 a_865_255# CLK VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1019 a_809_463# a_757_317# a_380_50# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_1641_21# a_1599_113# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR SCE a_35_74# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.872e+11p ps=2.49e+06u
-M1022 a_1578_533# a_757_317# a_1445_69# VPB phighvt w=420000u l=150000u
-+  ad=1.848e+11p pd=1.72e+06u as=0p ps=0u
-M1023 a_1641_21# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Q a_2408_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1025 a_380_50# RESET_B VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND SCE a_35_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1027 VGND RESET_B a_225_50# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_380_50# D a_355_463# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_937_333# a_809_463# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_937_333# a_809_463# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR a_1641_21# a_1578_533# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_809_463# a_865_255# a_380_50# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=4.1455e+11p ps=3.75e+06u
-M1033 a_380_50# D a_308_50# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_991_119# a_757_317# a_809_463# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR a_865_255# a_757_317# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1036 VGND RESET_B a_1085_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_895_463# a_865_255# a_809_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_512_81# SCE a_380_50# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND a_1445_69# a_2408_367# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 a_355_463# D a_380_50# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 VPWR RESET_B a_380_50# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_937_333# a_865_255# a_1445_69# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 a_225_50# a_35_74# a_308_50# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR a_2408_367# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_1818_119# a_1445_69# a_1641_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR CLK a_865_255# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VGND CLK a_865_255# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_2408_367# a_1445_69# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_380_50# a_865_255# a_809_463# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_35_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 a_380_50# a_35_74# a_513_463# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 a_1599_113# a_1641_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VGND a_2408_367# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 VPWR RESET_B a_809_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 a_512_81# SCD a_225_50# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_757_317# a_865_255# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_1641_21# a_1445_69# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 VGND a_809_463# a_937_333# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 a_380_50# a_757_317# a_809_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 a_1578_533# a_1641_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 VPWR RESET_B a_1641_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 a_809_463# a_757_317# a_991_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VPWR SCE a_355_463# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X24 a_308_50# D a_380_50# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_757_317# a_865_255# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 a_35_74# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_809_463# a_865_255# a_895_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 a_895_463# a_937_333# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X29 VPWR a_809_463# a_937_333# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X30 a_380_50# SCE a_512_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_225_50# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 a_2408_367# a_1445_69# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X33 a_1085_119# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 VGND RESET_B a_1818_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 a_1445_69# a_757_317# a_1578_533# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X36 a_991_119# a_937_333# a_1085_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 a_937_333# a_757_317# a_1445_69# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X38 a_1445_69# a_865_255# a_1599_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 a_513_463# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.cdl b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.cdl
index f92ad95..19ebf27 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.cdl
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_lp__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.84 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.84 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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 net062 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 net048 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.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net069 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 net077 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 net041 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
-MI653 Q net041 VNB nshort 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
-MI654 net061 net062 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net062 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 net048 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 net069 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 net077 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 net041 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
+MI653 Q net041 VNB nfet_01v8 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
+MI654 net061 net062 VNB nfet_01v8 m=1 w=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 net84 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 net84 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.26 l=0.15 mult=1 sa=0.265
+MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.26 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
-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 net0133 net062 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI662 net0133 net062 VPB pfet_01v8_hvt m=1 w=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 net062 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
-MI659 net062 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI658 net062 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
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI30 net0156 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 net041 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
+MI660 Q net041 VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.84 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 net062 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 net0156 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 net041 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
-MI660 Q net041 VPB phighvt m=2 w=1.26 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=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 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
-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_lp__sdfrtp_2
diff --git a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.netlist.tsv b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.netlist.tsv
index b2a1d3d..3911206 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.netlist.tsv
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.84	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	net062	s0	net048	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net048	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net069	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	net077	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net077	M1	net069	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net061	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net041	s0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net041	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net061	net062	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	net84	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	net84	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	net84	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.26	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	net0133	net062	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net062	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	net0133	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net062	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net0156	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	net0156	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	net041	s0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net041	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.84	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	net062	s0	net048	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net048	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	net069	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	net077	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net077	M1	net069	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net061	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net041	s0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net041	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net061	net062	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	net84	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	net84	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	net84	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.26	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.26	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	net0133	net062	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net062	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	net0133	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net062	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	net0156	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	net0156	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	net041	s0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net041	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	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
+MI650	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
+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_lp__sdfrtp_2.spice b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.spice
index 9376601..c883a4a 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.spice
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.spice
@@ -16,88 +16,46 @@
 
 
 .subckt sky130_fd_sc_lp__sdfrtp_2 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
-M1000 a_225_50# SCD a_512_81# VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=8.82e+10p ps=1.26e+06u
-M1001 a_894_463# a_864_255# a_808_463# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.289e+11p ps=2.77e+06u
-M1002 VPWR a_864_255# a_756_265# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.72075e+12p pd=2.2e+07u as=3.339e+11p ps=3.05e+06u
-M1003 a_308_50# a_35_74# a_225_50# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 VPWR a_936_333# a_894_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_1085_119# a_936_333# a_991_119# VNB nshort w=420000u l=150000u
-+  ad=1.554e+11p pd=1.62e+06u as=1.344e+11p ps=1.48e+06u
-M1006 VGND a_864_255# a_756_265# VNB nshort w=840000u l=150000u
-+  ad=1.6517e+12p pd=1.461e+07u as=2.394e+11p ps=2.25e+06u
-M1007 a_332_468# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1008 a_864_255# CLK VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1009 a_1406_69# a_864_255# a_936_333# VPB phighvt w=840000u l=150000u
-+  ad=4.3735e+11p pd=3.33e+06u as=2.352e+11p ps=2.24e+06u
-M1010 VPWR a_2431_47# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1011 VGND a_1406_69# a_2431_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1012 VPWR SCD a_490_468# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.048e+11p ps=1.92e+06u
-M1013 a_808_463# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1635_21# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1015 a_1406_69# a_756_265# a_936_333# VNB nshort w=640000u l=150000u
-+  ad=3.88e+11p pd=2.85e+06u as=1.792e+11p ps=1.84e+06u
-M1016 a_808_463# a_756_265# a_380_50# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=3.95e+11p ps=3.87e+06u
-M1017 VGND a_1635_21# a_1593_113# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1018 a_490_468# a_35_74# a_380_50# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND RESET_B a_225_50# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_864_255# CLK VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1021 a_1569_534# a_756_265# a_1406_69# VPB phighvt w=420000u l=150000u
-+  ad=1.848e+11p pd=1.72e+06u as=0p ps=0u
-M1022 VPWR SCE a_35_74# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1023 VGND SCE a_35_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1024 Q a_2431_47# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1025 a_936_333# a_808_463# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_380_50# RESET_B VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1593_113# a_864_255# a_1406_69# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR a_1406_69# a_2431_47# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1029 Q a_2431_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_936_333# a_808_463# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_808_463# a_864_255# a_380_50# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=4.1875e+11p ps=3.77e+06u
-M1032 a_380_50# D a_332_468# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_380_50# D a_308_50# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1809_119# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1035 VPWR a_1635_21# a_1569_534# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_991_119# a_756_265# a_808_463# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND RESET_B a_1085_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR a_1406_69# a_1635_21# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_512_81# SCE a_380_50# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_1635_21# a_1406_69# a_1809_119# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1041 VGND a_2431_47# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_808_463# a_936_333# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 Q a_2431_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_1406_69# a_864_255# a_1593_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_225_50# a_35_74# a_308_50# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_380_50# a_864_255# a_808_463# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_1809_119# a_1406_69# a_1635_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_490_468# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 VPWR RESET_B a_808_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_936_333# a_864_255# a_1406_69# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 a_512_81# SCD a_225_50# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_332_468# D a_380_50# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 VGND CLK a_864_255# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_380_50# a_756_265# a_808_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 a_2431_47# a_1406_69# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 VGND a_808_463# a_936_333# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 VPWR RESET_B a_1635_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 a_808_463# a_756_265# a_991_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_308_50# D a_380_50# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_225_50# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_756_265# a_864_255# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 a_1569_534# a_1635_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 a_2431_47# a_1406_69# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 VPWR CLK a_864_255# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 a_35_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X24 a_380_50# a_35_74# a_490_468# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X25 a_35_74# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VGND a_2431_47# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 a_808_463# a_864_255# a_894_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 a_894_463# a_936_333# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X29 Q a_2431_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X30 a_380_50# SCE a_512_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_936_333# a_756_265# a_1406_69# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X32 a_1635_21# a_1406_69# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X33 VPWR a_2431_47# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X34 a_1085_119# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 a_991_119# a_936_333# a_1085_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 a_1593_113# a_1635_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 VPWR SCE a_332_468# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X38 VGND RESET_B a_1809_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 a_1406_69# a_756_265# a_1569_534# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X40 VPWR RESET_B a_380_50# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X41 a_756_265# a_864_255# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_4.cdl b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_4.cdl
index 352c721..9b58195 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_4.cdl
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_4.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_lp__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.84 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.84 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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 net062 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 net048 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.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net069 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 net077 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 net041 s0 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 Q net041 VNB nshort m=4 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net061 net062 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net062 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 net048 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 net069 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 net077 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 net041 s0 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net041 VNB nfet_01v8 m=4 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net061 net062 VNB nfet_01v8 m=1 w=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 net84 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 net84 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.26 l=0.15 mult=1 sa=0.265
+MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.26 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
-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 net0133 net062 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI662 net0133 net062 VPB pfet_01v8_hvt m=1 w=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 net062 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
-MI659 net062 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI658 net062 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
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI30 net0156 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 net041 s0 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI660 Q net041 VPB pfet_01v8_hvt m=4 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.84 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 net062 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 net0156 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 net041 s0 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI660 Q net041 VPB phighvt m=4 w=1.26 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=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 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
-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_lp__sdfrtp_4
diff --git a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_4.netlist.tsv b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_4.netlist.tsv
index a310b4d..45b0588 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_4.netlist.tsv
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_4.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.84	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	net062	s0	net048	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net048	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net069	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	net077	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net077	M1	net069	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net061	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net041	s0	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net041	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net061	net062	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	net84	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	net84	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	net84	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.26	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	net0133	net062	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net062	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	net0133	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net062	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net0156	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	net0156	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	net041	s0	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net041	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	0.84	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.84	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	net062	s0	net048	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net048	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	net069	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	net077	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net077	M1	net069	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net061	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net041	s0	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net041	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net061	net062	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	net84	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	net84	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	net84	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.26	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.26	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	net0133	net062	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net062	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	net0133	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net062	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	net0156	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	net0156	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	net041	s0	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net041	VPWR	VPB	pfet_01v8_hvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	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
+MI650	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
+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_lp__sdfrtp_4.spice b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_4.spice
index 1a7702e..23eba79 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_4.spice
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_4.spice
@@ -16,96 +16,50 @@
 
 
 .subckt sky130_fd_sc_lp__sdfrtp_4 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
-M1000 VGND SCE a_27_74# VNB nshort w=420000u l=150000u
-+  ad=1.8964e+12p pd=1.655e+07u as=1.113e+11p ps=1.37e+06u
-M1001 VGND RESET_B a_217_50# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.289e+11p ps=2.77e+06u
-M1002 VPWR SCE a_27_74# VPB phighvt w=640000u l=150000u
-+  ad=3.1901e+12p pd=2.491e+07u as=1.696e+11p ps=1.81e+06u
-M1003 VPWR a_1047_369# a_1005_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1004 VPWR a_975_255# a_851_242# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.402e+11p ps=3.06e+06u
-M1005 Q a_2555_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1006 a_1705_113# a_975_255# a_1524_69# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.754e+11p ps=2.79e+06u
-M1007 a_1005_463# a_975_255# a_881_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=3.087e+11p ps=3.15e+06u
-M1008 VPWR a_2555_47# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_881_463# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_1524_69# a_975_255# a_1047_369# VPB phighvt w=840000u l=150000u
-+  ad=4.361e+11p pd=3.32e+06u as=2.352e+11p ps=2.24e+06u
-M1011 a_975_255# CLK VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1012 VPWR SCD a_565_463# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.048e+11p ps=1.92e+06u
-M1013 a_1662_533# a_851_242# a_1524_69# VPB phighvt w=420000u l=150000u
-+  ad=1.848e+11p pd=1.72e+06u as=0p ps=0u
-M1014 VGND a_2555_47# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=5.04e+11p ps=4.56e+06u
-M1015 a_1047_369# a_881_463# VGND VNB nshort w=640000u l=150000u
-+  ad=3.104e+11p pd=2.25e+06u as=0p ps=0u
-M1016 a_1747_21# a_1524_69# a_1902_119# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1017 a_881_463# a_851_242# a_372_50# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=3.95e+11p ps=3.87e+06u
-M1018 a_1747_21# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1019 a_1524_69# a_851_242# a_1047_369# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_565_463# a_27_74# a_372_50# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_300_50# a_27_74# a_217_50# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1022 a_1047_369# a_881_463# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_372_50# D a_300_50# VNB nshort w=420000u l=150000u
-+  ad=3.8515e+11p pd=3.61e+06u as=0p ps=0u
-M1024 a_1107_119# a_851_242# a_881_463# VNB nshort w=420000u l=150000u
-+  ad=1.344e+11p pd=1.48e+06u as=1.176e+11p ps=1.4e+06u
-M1025 Q a_2555_47# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1902_119# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_2555_47# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR a_1747_21# a_1662_533# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_504_81# SCE a_372_50# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1030 a_881_463# a_975_255# a_372_50# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND a_975_255# a_851_242# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.25e+06u
-M1032 a_217_50# SCD a_504_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_372_50# RESET_B VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VPWR a_2555_47# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_407_463# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1036 VGND RESET_B a_1201_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1037 a_975_255# CLK VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1038 a_372_50# D a_407_463# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND a_1747_21# a_1705_113# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 Q a_2555_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VGND a_1524_69# a_2555_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1042 VPWR a_1524_69# a_1747_21# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 Q a_2555_47# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VPWR a_1524_69# a_2555_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1045 a_1201_119# a_1047_369# a_1107_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR RESET_B a_372_50# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_27_74# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_217_50# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND a_2555_47# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_300_50# D a_372_50# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_1107_119# a_1047_369# a_1201_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR RESET_B a_1747_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VPWR RESET_B a_881_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_1902_119# a_1524_69# a_1747_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_2555_47# a_1524_69# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VPWR CLK a_975_255# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_372_50# SCE a_504_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_1705_113# a_1747_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_565_463# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 a_1747_21# a_1524_69# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 VGND RESET_B a_1902_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_1005_463# a_1047_369# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 a_217_50# a_27_74# a_300_50# 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 VPWR SCE a_407_463# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 a_407_463# D a_372_50# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X21 a_372_50# a_975_255# a_881_463# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 Q a_2555_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_851_242# a_975_255# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 a_1524_69# a_975_255# a_1705_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 VPWR a_2555_47# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 VGND CLK a_975_255# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 VGND a_881_463# a_1047_369# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X28 a_1047_369# a_851_242# a_1524_69# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X29 a_1662_533# a_1747_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X30 VPWR a_2555_47# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 a_372_50# a_27_74# a_565_463# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X32 a_881_463# a_975_255# a_1005_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X33 VGND a_2555_47# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X34 a_372_50# a_851_242# a_881_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X35 a_881_463# a_851_242# a_1107_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 Q a_2555_47# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X37 Q a_2555_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X38 a_851_242# a_975_255# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X39 a_1047_369# a_975_255# a_1524_69# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X40 VPWR a_881_463# a_1047_369# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X41 a_2555_47# a_1524_69# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X42 Q a_2555_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X43 a_1201_119# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X44 a_504_81# SCD a_217_50# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X45 a_1524_69# a_851_242# a_1662_533# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.cdl b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.cdl
index 5af4a28..39328c6 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.cdl
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.cdl
@@ -17,96 +17,96 @@
 .SUBCKT sky130_fd_sc_lp__sdfrtp_lp2 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
-MI691 net101 net198 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI691 net101 net198 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI690 net150 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
-MI685 net93 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
-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 net99 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 net137 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI690 net150 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
-MI33 net130 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI685 net93 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
-MI669 net126 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
-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 net114 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 net198 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
-MI653 Q net198 VNB nshort m=1 w=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 net99 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
-MI647 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
-MI649 M1 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
-MI676 net86 CLK VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI675 clkneg CLK VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI673 clkpos clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net99 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
-MI674 net74 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 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.063 perim=1.14
-MI666 net157 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI33 net130 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
+MI669 net126 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
+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
+MI34 net114 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 net198 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
+MI653 Q net198 VNB nfet_01v8 m=1 w=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 net99 VNB nfet_01v8 m=1 w=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.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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI676 net86 CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI675 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI673 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI674 net74 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
+MI666 net157 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
-MI43 db clkpos 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
-MI662 net230 net99 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
-MI659 net99 RESET_B VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265
+MI43 db clkpos 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
-MI633 sceb SCE 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
-MI664 s0 clkpos 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
-MI658 net99 s0 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
-MI30 net205 M1 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
-MI31 M0 clkneg 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
-MI32 M0 RESET_B 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
-MI663 net198 s0 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
-MI660 Q net198 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
-MI648 M1 M0 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
-MI650 M1 clkneg 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
-MI680 clkneg CLK 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
-MI679 clkpos clkneg VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265
+MI662 net230 net99 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
-MI101 db sceb VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI659 net99 RESET_B 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
+MI633 sceb SCE 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
+MI664 s0 clkpos 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
+MI658 net99 s0 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
+MI30 net205 M1 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
+MI31 M0 clkneg 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
+MI32 M0 RESET_B 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
+MI663 net198 s0 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
+MI660 Q net198 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
+MI648 M1 M0 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
-MI107 p0 SCE VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI650 M1 clkneg 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
+MI680 clkneg CLK 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
+MI679 clkpos clkneg 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
+MI101 db sceb 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
+MI107 p0 SCE 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
-MI94 db D 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
-MI108 p1 SCD VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI94 db D 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
-MI665 db RESET_B VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI108 p1 SCD 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
+MI665 db RESET_B 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_lp__sdfrtp_lp2
diff --git a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.netlist.tsv b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.netlist.tsv
index 5ca4aae..fed2f4e 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.netlist.tsv
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.netlist.tsv
@@ -1,48 +1,48 @@
 sky130_fd_sc_lp__sdfrtp_lp2	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
-MI691	MOSFET	net101	net198	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI690	MOSFET	net150	s0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI685	MOSFET	net93	M0	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
-MI656	MOSFET	net99	s0	net137	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net137	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net130	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	net126	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	sceb	SCE	net126	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI4	MOSFET	M0	clkpos	net114	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net114	M1	net130	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net109	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net198	s0	net150	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net198	net101	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net109	net99	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	M1	M0	net93	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI676	MOSFET	net86	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	clkneg	CLK	net86	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI673	MOSFET	clkpos	clkneg	net74	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI674	MOSFET	net74	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	net157	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	net157	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	net157	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net230	net99	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net99	RESET_B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net230	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net99	s0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net205	M1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net205	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net198	s0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net198	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI680	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI679	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	db	RESET_B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI691	MOSFET	net101	net198	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI690	MOSFET	net150	s0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI685	MOSFET	net93	M0	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
+MI656	MOSFET	net99	s0	net137	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net137	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	net130	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	net126	SCE	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	net126	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI4	MOSFET	M0	clkpos	net114	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net114	M1	net130	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net109	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net198	s0	net150	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net198	net101	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net109	net99	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	net93	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI676	MOSFET	net86	CLK	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI675	MOSFET	clkneg	CLK	net86	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI673	MOSFET	clkpos	clkneg	net74	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI674	MOSFET	net74	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	net157	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	net157	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	net157	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net230	net99	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net99	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI633	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net230	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net99	s0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net205	M1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net205	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net198	s0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net198	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	M1	clkneg	s0	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI680	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI679	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	db	RESET_B	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/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.spice b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.spice
index 35606d4..3db04e5 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.spice
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.spice
@@ -16,96 +16,50 @@
 
 
 .subckt sky130_fd_sc_lp__sdfrtp_lp2 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
-M1000 a_141_88# a_81_194# a_38_41# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.3905e+11p ps=3.44e+06u
-M1001 a_223_419# D a_116_419# VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=9.545e+11p ps=7.95e+06u
-M1002 a_2092_47# a_876_119# a_1605_93# VPB phighvt w=1e+06u l=250000u
-+  ad=5.531e+11p pd=3.66e+06u as=3.6e+11p ps=2.72e+06u
-M1003 VPWR a_2435_296# a_2387_419# VPB phighvt w=1e+06u l=250000u
-+  ad=3.19e+12p pd=2.238e+07u as=2.4e+11p ps=2.48e+06u
-M1004 VPWR a_2092_47# a_2435_296# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1005 VPWR a_2092_47# a_2863_90# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1006 a_1605_93# a_1432_119# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Q a_2863_90# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1008 a_1561_119# a_1147_408# a_1432_119# VNB nshort w=420000u l=150000u
-+  ad=9.24e+10p pd=1.28e+06u as=2.079e+11p ps=1.83e+06u
-M1009 VPWR RESET_B a_116_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_337_88# SCE a_116_419# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=3.2335e+11p ps=3.26e+06u
-M1011 VGND RESET_B a_38_41# VNB nshort w=420000u l=150000u
-+  ad=1.35797e+12p pd=1.063e+07u as=0p ps=0u
-M1012 a_2661_47# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1013 a_81_194# SCE a_697_119# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1014 a_1432_119# a_876_119# a_116_419# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_959_119# CLK a_876_119# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1016 a_1147_408# a_876_119# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1017 VGND a_2092_47# a_2950_90# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1018 VPWR SCE a_223_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1432_119# a_1147_408# a_116_419# VPB phighvt w=1e+06u l=250000u
-+  ad=8.6e+11p pd=5.72e+06u as=0p ps=0u
-M1020 a_2399_47# a_876_119# a_2092_47# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=5.817e+11p ps=3.61e+06u
-M1021 VGND RESET_B a_1635_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.822e+11p ps=2.31e+06u
-M1022 a_1900_47# a_1432_119# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1023 a_81_194# SCE VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1024 a_1432_119# RESET_B VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_697_119# SCE VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1635_119# a_1605_93# a_1561_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_2435_296# a_2092_47# a_2661_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1028 a_2435_296# RESET_B VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1149_119# a_876_119# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1030 a_116_419# a_81_194# a_439_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1031 VPWR CLK a_876_119# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1032 VGND CLK a_959_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1605_93# a_1432_119# a_1900_47# VNB nshort w=420000u l=150000u
-+  ad=1.764e+11p pd=1.68e+06u as=0p ps=0u
-M1034 VGND a_2435_296# a_2399_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_2950_90# a_2092_47# a_2863_90# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1036 Q a_2863_90# a_3108_90# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1037 a_2387_419# a_1147_408# a_2092_47# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1147_408# a_876_119# a_1149_119# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1039 a_2092_47# a_1147_408# a_1605_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_3108_90# a_2863_90# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_439_419# SCD VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_1633_347# a_876_119# a_1432_119# VPB phighvt w=1e+06u l=250000u
-+  ad=2.1e+11p pd=2.42e+06u as=0p ps=0u
-M1043 a_116_419# D a_141_88# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_38_41# SCD a_337_88# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VPWR a_1605_93# a_1633_347# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_141_88# D a_116_419# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_116_419# a_1147_408# a_1432_119# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 VPWR RESET_B a_2435_296# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_1635_119# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_116_419# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_2387_419# a_2435_296# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_2863_90# a_2092_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_1432_119# a_876_119# a_1633_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_959_119# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_1432_119# a_1147_408# a_1561_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_876_119# CLK a_959_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_1900_47# a_1432_119# a_1605_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_116_419# D a_223_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X13 VPWR a_876_119# a_1147_408# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X14 VGND a_1432_119# a_1900_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VGND a_2863_90# a_3108_90# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_223_419# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X17 a_876_119# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X18 a_116_419# SCE a_337_88# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_1149_119# a_876_119# a_1147_408# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VPWR RESET_B a_1432_119# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X21 a_439_419# a_81_194# a_116_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X22 a_1605_93# a_876_119# a_2092_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X23 a_337_88# SCD a_38_41# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_697_119# SCE a_81_194# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_38_41# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VGND a_876_119# a_1149_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_2863_90# a_2092_47# a_2950_90# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_2661_47# a_2092_47# a_2435_296# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_2950_90# a_2092_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_38_41# a_81_194# a_141_88# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 VPWR a_1432_119# a_1605_93# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X32 a_1633_347# a_1605_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X33 VGND SCE a_697_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_1561_119# a_1605_93# a_1635_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 VGND RESET_B a_2661_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 VPWR SCE a_81_194# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X37 VPWR a_2863_90# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X38 a_2092_47# a_876_119# a_2399_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 VPWR SCD a_439_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X40 a_2435_296# a_2092_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X41 a_116_419# a_876_119# a_1432_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X42 a_1605_93# a_1147_408# a_2092_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X43 a_3108_90# a_2863_90# Q VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X44 a_2399_47# a_2435_296# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X45 a_2092_47# a_1147_408# a_2387_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.cdl b/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.cdl
index e357cac..e9abafd 100644
--- a/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.cdl
+++ b/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.cdl
@@ -17,84 +17,84 @@
 .SUBCKT sky130_fd_sc_lp__sdfrtp_ov2 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.42 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.42 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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 net062 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 net048 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.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI33 net069 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 net077 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 net041 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
-MI653 Q net041 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net061 net062 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI656 net062 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI657 net048 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 net069 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
-MI669 M1 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI34 net077 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 net041 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
+MI653 Q net041 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net061 net062 VNB nfet_01v8 m=1 w=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.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI666 net84 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI669 M1 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
+MI666 net84 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
-MI668 M1 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 clkneg CLK VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI668 M1 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
-MI635 clkpos clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=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 net0133 net062 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=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
-MI659 net062 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI662 net0133 net062 VPB pfet_01v8_hvt m=1 w=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 net062 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
-MI664 s0 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI658 net062 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 net0156 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 net041 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
+MI660 Q net041 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI633 sceb SCE VPB pfet_01v8_hvt m=1 w=0.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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI107 p0 SCE VPB pfet_01v8_hvt m=1 w=0.42 l=0.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.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net062 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 net0156 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 net041 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
-MI660 Q net041 VPB phighvt m=1 w=1.26 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI633 sceb SCE VPB 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.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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI94 db D VPB phighvt m=1 w=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.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 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI108 p1 SCD VPB pfet_01v8_hvt m=1 w=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 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
 .ENDS sky130_fd_sc_lp__sdfrtp_ov2
diff --git a/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.netlist.tsv b/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.netlist.tsv
index 0e2409e..8bbc3b3 100644
--- a/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.netlist.tsv
+++ b/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_lp__sdfrtp_ov2	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	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
-MI656	MOSFET	net062	s0	net048	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net048	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net069	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	net077	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net077	M1	net069	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net061	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net041	s0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net041	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net061	net062	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	M1	clkpos	s0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	net84	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	net84	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	net84	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI668	MOSFET	M1	clkneg	s0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	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
-MI662	MOSFET	net0133	net062	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net062	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	net0133	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net062	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net0156	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	net0156	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	net041	s0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net041	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	db	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkneg	CLK	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	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
+MI656	MOSFET	net062	s0	net048	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net048	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	net069	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	net077	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net077	M1	net069	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net061	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net041	s0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net041	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net061	net062	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	M1	clkpos	s0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	net84	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	net84	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	net84	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI668	MOSFET	M1	clkneg	s0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	0.42	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.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
+MI662	MOSFET	net0133	net062	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net062	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	net0133	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net062	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	net0156	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	net0156	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	net041	s0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net041	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	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
+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.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.42	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.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.spice b/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.spice
index b1639fc..285b999 100644
--- a/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.spice
+++ b/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__sdfrtp_ov2 CLK D RESET_B SCD SCE VGND VNB VPB VPWR Q
-M1000 a_225_50# SCD a_512_81# VNB nshort w=420000u l=150000u
-+  ad=2.478e+11p pd=2.86e+06u as=8.82e+10p ps=1.26e+06u
-M1001 a_355_463# SCE VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.24325e+12p ps=1.891e+07u
-M1002 VPWR a_937_333# a_895_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1003 VPWR a_1445_113# a_2408_367# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1004 a_1818_119# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.3162e+12p ps=1.2e+07u
-M1005 a_308_50# a_35_74# a_225_50# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1006 VPWR SCD a_513_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1007 a_865_255# CLK VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1008 a_1641_21# a_1445_113# a_1818_119# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1009 a_1085_119# a_937_333# a_991_119# VNB nshort w=420000u l=150000u
-+  ad=1.554e+11p pd=1.62e+06u as=1.344e+11p ps=1.48e+06u
-M1010 a_937_333# a_809_463# VGND VNB nshort w=420000u l=150000u
-+  ad=1.995e+11p pd=1.79e+06u as=0p ps=0u
-M1011 a_1599_113# a_865_255# a_1445_113# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.604e+11p ps=2.08e+06u
-M1012 VPWR SCE a_35_74# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.872e+11p ps=2.49e+06u
-M1013 a_809_463# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=0p ps=0u
-M1014 VPWR a_1445_113# a_1641_21# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1015 a_513_463# a_35_74# a_380_50# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.8e+06u
-M1016 Q a_2408_367# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1017 a_1445_113# a_865_255# a_937_333# VPB phighvt w=420000u l=150000u
-+  ad=4.1685e+11p pd=3.32e+06u as=1.176e+11p ps=1.4e+06u
-M1018 a_865_255# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1019 a_809_463# a_757_317# a_380_50# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_1641_21# a_1599_113# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1578_533# a_757_317# a_1445_113# VPB phighvt w=420000u l=150000u
-+  ad=1.848e+11p pd=1.72e+06u as=0p ps=0u
-M1022 a_1641_21# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 Q a_2408_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1024 VGND SCE a_35_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1025 a_380_50# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND RESET_B a_225_50# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_380_50# D a_355_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1445_113# a_757_317# a_937_333# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_937_333# a_809_463# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND a_865_255# a_757_317# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1031 VPWR a_1641_21# a_1578_533# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR a_865_255# a_757_317# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1033 a_809_463# a_865_255# a_380_50# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=4.1455e+11p ps=3.75e+06u
-M1034 a_380_50# D a_308_50# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_991_119# a_757_317# a_809_463# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND RESET_B a_1085_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_895_463# a_865_255# a_809_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_512_81# SCE a_380_50# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND a_1445_113# a_2408_367# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 a_355_463# D a_380_50# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_937_333# a_865_255# a_1445_113# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_225_50# a_35_74# a_308_50# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR a_2408_367# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_937_333# a_757_317# a_1445_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_1818_119# a_1445_113# a_1641_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_757_317# a_865_255# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_2408_367# a_1445_113# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_380_50# a_865_255# a_809_463# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_380_50# a_35_74# a_513_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_1599_113# a_1641_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND a_2408_367# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VPWR RESET_B a_809_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 a_512_81# SCD a_225_50# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_1641_21# a_1445_113# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 a_380_50# a_757_317# a_809_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 a_1578_533# a_1641_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 VPWR RESET_B a_1641_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 a_809_463# a_757_317# a_991_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VPWR SCE a_355_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 VPWR RESET_B a_380_50# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 a_308_50# D a_380_50# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_35_74# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_809_463# a_865_255# a_895_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X24 a_895_463# a_937_333# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X25 VPWR a_809_463# a_937_333# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X26 a_380_50# SCE a_512_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_225_50# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_2408_367# a_1445_113# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X29 a_1085_119# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 VGND RESET_B a_1818_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 VGND CLK a_865_255# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 a_35_74# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X33 a_1445_113# a_757_317# a_1578_533# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X34 a_991_119# a_937_333# a_1085_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 a_757_317# a_865_255# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X36 a_1445_113# a_865_255# a_1599_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 a_513_463# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X38 VPWR CLK a_865_255# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X39 VGND a_809_463# a_937_333# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.cdl b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.cdl
index 7f761f5..d05b56f 100644
--- a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.cdl
+++ b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.cdl
@@ -17,88 +17,88 @@
 .SUBCKT sky130_fd_sc_lp__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
-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=0.64 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 net210 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
-MI660 Q net210 VPB phighvt m=1 w=1.26 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
-MI661 Q_N S0 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net145 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 net137 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=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 net125 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
-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=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
-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 net258 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 net249 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 net261 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
-MI651 Q_N S0 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkpos clkneg VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net245 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=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 net210 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
-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 net202 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI663 net210 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
-MI653 Q net210 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI660 Q net210 VPB pfet_01v8_hvt m=1 w=1.26 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
+MI661 Q_N S0 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net145 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 net137 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=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 net125 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
+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=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
-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 net258 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 net249 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 net261 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
+MI651 Q_N S0 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net245 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 net210 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net202 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 net210 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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_lp__sdfsbp_1
diff --git a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.netlist.tsv b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.netlist.tsv
index dae0212..0d81558 100644
--- a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.netlist.tsv
+++ b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.netlist.tsv
@@ -1,44 +1,44 @@
 sky130_fd_sc_lp__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
-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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net210	S0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net210	VPWR	VPB	phighvt	1	1.26	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
-MI661	MOSFET	Q_N	S0	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net145	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	net145	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net137	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	net137	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	net125	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net125	M0	VPWR	VPB	phighvt	1	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	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
-MI34	MOSFET	S0	clkpos	net261	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net258	S1	net202	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	net249	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net245	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net249	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net261	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	net258	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
-MI651	MOSFET	Q_N	S0	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net245	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net210	S0	VGND	VNB	nshort	1	0.42	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	net202	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	net210	VGND	VNB	nshort	1	0.84	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net210	S0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net210	VPWR	VPB	pfet_01v8_hvt	1	1.26	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
+MI661	MOSFET	Q_N	S0	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net145	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	net145	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net137	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	net137	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	net125	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net125	M0	VPWR	VPB	pfet_01v8_hvt	1	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	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
+MI34	MOSFET	S0	clkpos	net261	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net258	S1	net202	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	net249	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net245	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net249	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net261	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	net258	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
+MI651	MOSFET	Q_N	S0	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net245	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	net210	S0	VGND	VNB	nfet_01v8	1	0.42	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	net202	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	net210	VGND	VNB	nfet_01v8	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
diff --git a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.spice b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.spice
index caa045d..d3f6412 100644
--- a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.spice
+++ b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.spice
@@ -16,88 +16,46 @@
 
 
 .subckt sky130_fd_sc_lp__sdfsbp_1 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_1232_463# a_640_481# a_1146_463# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1001 VPWR a_2067_92# a_2025_488# VPB phighvt w=420000u l=150000u
-+  ad=2.99083e+12p pd=2.169e+07u as=8.82e+10p ps=1.26e+06u
-M1002 a_2582_150# a_1920_119# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=1.7578e+12p ps=1.526e+07u
-M1003 a_1920_119# SET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=3.801e+11p pd=3.8e+06u as=0p ps=0u
-M1004 a_1274_401# a_1146_463# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1005 a_1575_119# a_1146_463# a_1274_401# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1006 a_478_47# SCE a_275_481# VNB nshort w=420000u l=150000u
-+  ad=1.155e+11p pd=1.39e+06u as=3.717e+11p ps=3.45e+06u
-M1007 Q_N a_1920_119# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1008 a_383_481# a_34_481# a_275_481# VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=3.609e+11p ps=3.43e+06u
-M1009 a_640_481# CLK VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1010 VPWR SET_B a_1274_401# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR SCD a_383_481# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_2025_488# a_901_441# a_1920_119# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND SCE a_34_481# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1014 a_275_481# D a_252_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1015 VGND a_1274_401# a_1245_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1016 VPWR a_1920_119# a_2067_92# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1017 a_901_441# a_640_481# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1018 a_1146_463# a_901_441# a_275_481# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1818_379# a_1146_463# VPWR VPB phighvt w=840000u l=150000u
-+  ad=3.199e+11p pd=2.65e+06u as=0p ps=0u
-M1020 VGND a_2582_150# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.25e+06u
-M1021 Q_N a_1920_119# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1022 VPWR SCE a_34_481# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1023 a_640_481# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1024 a_1146_463# a_640_481# a_275_481# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1025 a_1245_119# a_901_441# a_1146_463# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_901_441# a_640_481# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1027 VPWR a_2582_150# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1028 VGND SET_B a_2097_118# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1029 a_1848_119# a_1146_463# VGND VNB nshort w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1030 a_2025_118# a_640_481# a_1920_119# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.165e+11p ps=2.04e+06u
-M1031 VPWR a_1274_401# a_1232_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_252_47# a_34_481# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VGND a_1920_119# a_2067_92# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1034 a_203_481# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1035 a_2097_118# a_2067_92# a_2025_118# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND SCD a_478_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_2582_150# a_1920_119# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1038 a_1920_119# a_901_441# a_1848_119# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_275_481# D a_203_481# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_1920_119# a_640_481# a_1818_379# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VGND SET_B a_1575_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_2067_92# a_1920_119# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_1575_119# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_1232_463# a_1274_401# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VPWR SET_B a_1920_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_1848_119# a_901_441# a_1920_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 VPWR a_1146_463# a_1274_401# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_1274_401# a_1146_463# a_1575_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_640_481# a_901_441# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VGND a_1146_463# a_1848_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 VGND CLK a_640_481# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_275_481# a_640_481# a_1146_463# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 Q a_2582_150# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_275_481# a_901_441# a_1146_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 a_2097_118# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VPWR a_640_481# a_901_441# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X15 a_34_481# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_34_481# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X17 a_275_481# a_34_481# a_383_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 a_383_481# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 VGND a_34_481# a_252_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VPWR a_1146_463# a_1818_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X21 a_2025_488# a_2067_92# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 VPWR a_1920_119# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 a_2025_118# a_2067_92# a_2097_118# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VPWR SCE a_203_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X25 a_203_481# D a_275_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X26 a_1818_379# a_640_481# a_1920_119# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X27 a_252_47# D a_275_481# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_1146_463# a_901_441# a_1245_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_1146_463# a_640_481# a_1232_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X30 VGND a_1920_119# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X31 a_275_481# SCE a_478_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 a_1920_119# a_901_441# a_2025_488# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X33 a_2067_92# a_1920_119# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 Q a_2582_150# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X35 VPWR a_1920_119# a_2582_150# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X36 VPWR CLK a_640_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X37 a_1245_119# a_1274_401# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 a_1274_401# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X39 a_1920_119# a_640_481# a_2025_118# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X40 VGND a_1920_119# a_2582_150# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X41 a_478_47# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.cdl b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.cdl
index 17e0451..0a1df0d 100644
--- a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.cdl
+++ b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.cdl
@@ -17,88 +17,88 @@
 .SUBCKT sky130_fd_sc_lp__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
-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=0.64 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 net175 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
-MI660 Q net175 VPB phighvt m=2 w=1.26 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
-MI661 Q_N S0 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net110 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 net102 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=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 net90 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
-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=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
-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 net223 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 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
-MI36 net203 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
-MI651 Q_N S0 VNB nshort 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
-MI46 clkpos clkneg VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net210 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=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 net175 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
-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 net167 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI663 net175 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
-MI653 Q net175 VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI660 Q net175 VPB pfet_01v8_hvt m=2 w=1.26 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
+MI661 Q_N S0 VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net110 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 net102 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=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 net90 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
+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=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
-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 net223 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 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
+MI36 net203 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
+MI651 Q_N S0 VNB nfet_01v8 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
+MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net210 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 net175 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net167 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 net175 VNB nfet_01v8 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
+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_lp__sdfsbp_2
diff --git a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.netlist.tsv b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.netlist.tsv
index e3c4eee..128c386 100644
--- a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.netlist.tsv
+++ b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.netlist.tsv
@@ -1,44 +1,44 @@
 sky130_fd_sc_lp__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
-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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net175	S0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net175	VPWR	VPB	phighvt	2	1.26	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
-MI661	MOSFET	Q_N	S0	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net110	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	net110	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net102	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	net102	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	net90	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net90	M0	VPWR	VPB	phighvt	1	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	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
-MI34	MOSFET	S0	clkpos	net203	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net223	S1	net167	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	net214	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net210	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net214	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net203	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	net223	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
-MI651	MOSFET	Q_N	S0	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net210	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net175	S0	VGND	VNB	nshort	1	0.42	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	net167	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	net175	VGND	VNB	nshort	2	0.84	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net175	S0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net175	VPWR	VPB	pfet_01v8_hvt	2	1.26	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
+MI661	MOSFET	Q_N	S0	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net110	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	net110	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net102	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	net102	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	net90	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net90	M0	VPWR	VPB	pfet_01v8_hvt	1	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	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
+MI34	MOSFET	S0	clkpos	net203	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net223	S1	net167	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	net214	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net210	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net214	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net203	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	net223	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
+MI651	MOSFET	Q_N	S0	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net210	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	net175	S0	VGND	VNB	nfet_01v8	1	0.42	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	net167	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	net175	VGND	VNB	nfet_01v8	2	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
diff --git a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.spice b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.spice
index 2906859..6f0205d 100644
--- a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.spice
+++ b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.spice
@@ -16,96 +16,50 @@
 
 
 .subckt sky130_fd_sc_lp__sdfsbp_2 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_1799_408# SET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=3.885e+11p pd=3.84e+06u as=3.41865e+12p ps=2.776e+07u
-M1001 a_1163_119# a_920_73# a_268_467# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=3.609e+11p ps=3.43e+06u
-M1002 VPWR a_1946_369# a_1904_492# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1003 a_1291_93# a_1163_119# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1004 VGND SCE a_27_467# VNB nshort w=420000u l=150000u
-+  ad=1.987e+12p pd=1.911e+07u as=1.113e+11p ps=1.37e+06u
-M1005 a_196_467# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1006 a_920_73# a_629_47# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1007 VGND a_2624_49# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=5.46e+11p ps=2.98e+06u
-M1008 a_268_467# D a_196_467# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_2624_49# a_1799_408# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1010 VPWR a_1799_408# a_1946_369# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1011 a_471_47# SCE a_268_467# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.234e+11p ps=3.22e+06u
-M1012 VGND SCD a_471_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1697_379# a_1163_119# VPWR VPB phighvt w=840000u l=150000u
-+  ad=3.227e+11p pd=2.69e+06u as=0p ps=0u
-M1014 Q a_2624_49# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1015 Q a_2624_49# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_268_467# D a_268_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1017 a_1735_119# a_1163_119# VGND VNB nshort w=640000u l=150000u
-+  ad=1.888e+11p pd=1.87e+06u as=0p ps=0u
-M1018 Q_N a_1799_408# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1019 a_1249_119# a_920_73# a_1163_119# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1020 a_376_467# a_27_467# a_268_467# VPB phighvt w=640000u l=150000u
-+  ad=2.304e+11p pd=2e+06u as=0p ps=0u
-M1021 VPWR SCD a_376_467# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_1799_408# Q_N VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1023 a_629_47# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1024 VGND SET_B a_1530_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1025 a_629_47# CLK VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1026 a_1275_463# a_629_47# a_1163_119# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1027 a_268_47# a_27_467# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND a_1799_408# a_1946_369# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1029 VPWR SCE a_27_467# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1030 VPWR SET_B a_1291_93# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1799_408# a_629_47# a_1697_379# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1929_119# a_629_47# a_1799_408# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.158e+11p ps=2.03e+06u
-M1033 a_920_73# a_629_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1034 VPWR a_1291_93# a_1275_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND a_1291_93# a_1249_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1530_119# a_1163_119# a_1291_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1037 VGND a_1799_408# Q_N VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_2001_119# a_1946_369# a_1929_119# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1039 a_1163_119# a_629_47# a_268_467# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 Q_N a_1799_408# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_1799_408# a_920_73# a_1735_119# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_2624_49# a_1799_408# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1043 a_1904_492# a_920_73# a_1799_408# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 VPWR a_2624_49# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VGND SET_B a_2001_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_2624_49# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 VGND a_629_47# a_920_73# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND a_1799_408# a_2624_49# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VGND CLK a_629_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_268_467# a_629_47# a_1163_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 Q_N a_1799_408# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Q a_2624_49# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VPWR SET_B a_1799_408# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 Q a_2624_49# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_27_467# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_1735_119# a_920_73# a_1799_408# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 VPWR a_1799_408# a_2624_49# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 a_268_467# a_27_467# a_376_467# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 a_471_47# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VGND a_1799_408# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_2001_119# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VPWR SCE a_196_467# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X17 a_196_467# D a_268_467# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 a_1291_93# a_1163_119# a_1530_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_1799_408# a_629_47# a_1929_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VPWR a_1163_119# a_1291_93# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 VGND a_27_467# a_268_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 Q_N a_1799_408# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 a_268_467# a_920_73# a_1163_119# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X24 VPWR a_1799_408# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 a_27_467# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X26 a_1799_408# a_920_73# a_1904_492# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X27 a_1904_492# a_1946_369# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 a_376_467# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X29 VPWR a_1163_119# a_1697_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X30 a_1697_379# a_629_47# a_1799_408# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X31 a_268_467# SCE a_471_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 a_1249_119# a_1291_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 a_1946_369# a_1799_408# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_1291_93# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X35 a_1946_369# a_1799_408# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X36 VPWR CLK a_629_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X37 a_1163_119# a_629_47# a_1275_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X38 a_1163_119# a_920_73# a_1249_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 a_1530_119# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X40 VPWR a_629_47# a_920_73# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X41 a_1275_463# a_1291_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X42 a_1929_119# a_1946_369# a_2001_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X43 VPWR a_2624_49# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X44 a_268_47# D a_268_467# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X45 VGND a_1163_119# a_1735_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.cdl b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.cdl
index 659c309..bc23a51 100644
--- a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.cdl
+++ b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.cdl
@@ -17,102 +17,102 @@
 .SUBCKT sky130_fd_sc_lp__sdfsbp_lp 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
-MI645 sceb SCE 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
-MI658 M1 M0 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
-MI47 clkpos clkneg 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
-MI663 net196 S0 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
-MI660 Q net196 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
-MI659 M1 SET_B 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
-MI661 Q_N S0 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
-MI662 net111 M1 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
-MI664 M0 clkneg 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
-MI6 net103 S1 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
-MI669 S0 clkpos 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
-MI24 S0 SET_B 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
-MI648 S1 S0 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
-MI38 S0 clkneg 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
-MI37 net91 M0 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
-MI43 db clkpos 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
-MI45 clkneg CLK 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
-MI101 db sceb 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
-MI107 p0 SCE 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
-MI94 db D 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
-MI108 p1 SCD 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
-MI34 S0 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
-MI27 net252 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 net243 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
-MI676 net232 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
-MI677 net228 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
-MI36 net224 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
-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
-MI651 Q_N 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.42 l=0.15 mult=1 sa=0.265
+MI645 sceb SCE 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
-MI44 clkneg CLK VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI658 M1 M0 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
-MI657 net239 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 l=0.25 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net196 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
-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
-MI675 net188 net196 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI663 net196 S0 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
-MI25 net184 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI660 Q net196 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
-MI674 net180 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
-MI673 net176 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
-MI672 net172 CLK VNB nshort m=1 w=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 net196 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI671 net164 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI659 M1 SET_B 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
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI661 Q_N S0 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
+MI662 net111 M1 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
+MI664 M0 clkneg 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
+MI6 net103 S1 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
+MI669 S0 clkpos 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
+MI24 S0 SET_B 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
+MI648 S1 S0 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
+MI38 S0 clkneg 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
+MI37 net91 M0 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
+MI43 db clkpos 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
+MI45 clkneg CLK 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
+MI101 db sceb 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
+MI107 p0 SCE 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
+MI94 db D 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
+MI108 p1 SCD 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
+MI34 S0 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
+MI27 net252 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 net243 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
+MI676 net232 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
+MI677 net228 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
+MI36 net224 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
+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
+MI651 Q_N S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net239 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 net196 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI675 net188 net196 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net184 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
+MI674 net180 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
+MI673 net176 SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI672 net172 CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net196 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI671 net164 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 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_lp__sdfsbp_lp
diff --git a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.netlist.tsv b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.netlist.tsv
index 7e160a2..ff439e7 100644
--- a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.netlist.tsv
+++ b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.netlist.tsv
@@ -1,51 +1,51 @@
 sky130_fd_sc_lp__sdfsbp_lp	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
-MI645	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net196	S0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net196	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	S0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net111	M1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net111	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net103	S1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkpos	net103	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net91	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net91	M0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net224	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net252	S1	net184	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	net180	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net243	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net239	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net243	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI676	MOSFET	net232	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	net228	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net224	M0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net252	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
-MI651	MOSFET	Q_N	S0	net232	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkpos	clkneg	net164	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	net172	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net239	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net196	S0	net228	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	sceb	SCE	net176	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	net188	net196	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net184	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI674	MOSFET	net180	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI673	MOSFET	net176	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI672	MOSFET	net172	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net196	net188	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI671	MOSFET	net164	clkneg	VGND	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
+MI645	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net196	S0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net196	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	S0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net111	M1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net111	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net103	S1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkpos	net103	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net91	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net91	M0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net224	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net252	S1	net184	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	net180	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net243	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net239	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net243	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI676	MOSFET	net232	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	net228	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net224	M0	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	net252	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
+MI651	MOSFET	Q_N	S0	net232	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkpos	clkneg	net164	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	net172	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net239	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	net196	S0	net228	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	sceb	SCE	net176	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI675	MOSFET	net188	net196	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net184	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI674	MOSFET	net180	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI673	MOSFET	net176	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI672	MOSFET	net172	CLK	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net196	net188	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI671	MOSFET	net164	clkneg	VGND	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
diff --git a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.spice b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.spice
index 26138ba..51c4708 100644
--- a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.spice
+++ b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.spice
@@ -16,102 +16,53 @@
 
 
 .subckt sky130_fd_sc_lp__sdfsbp_lp CLK D SCD SCE SET_B VGND VNB VPB VPWR Q Q_N
-M1000 a_2019_419# a_761_113# a_1921_419# VPB phighvt w=1e+06u l=250000u
-+  ad=9.05e+11p pd=5.81e+06u as=2.4e+11p ps=2.48e+06u
-M1001 a_1729_125# a_1201_419# a_1423_99# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1002 a_1915_125# a_1201_419# VGND VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=1.2192e+12p ps=1.268e+07u
-M1003 a_3109_74# a_2865_74# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 VPWR a_1423_99# a_1373_419# VPB phighvt w=1e+06u l=250000u
-+  ad=3.205e+12p pd=2.241e+07u as=2.8e+11p ps=2.56e+06u
-M1005 VPWR SET_B a_1423_99# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1006 VGND CLK a_848_113# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1007 VGND SCE a_138_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1008 a_1201_419# a_987_409# a_352_409# VPB phighvt w=1e+06u l=250000u
-+  ad=6.1e+11p pd=3.22e+06u as=5.55e+11p ps=5.11e+06u
-M1009 VPWR a_2019_419# a_2865_74# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1010 VPWR SCE a_27_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1011 VGND a_1423_99# a_1381_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1012 VPWR a_2019_419# a_2220_40# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1013 a_2524_57# a_2019_419# a_2220_40# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1014 VGND a_2019_419# a_2524_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_362_47# a_27_409# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1016 a_352_409# D a_362_47# VNB nshort w=420000u l=150000u
-+  ad=2.373e+11p pd=2.81e+06u as=0p ps=0u
-M1017 Q_N a_2019_419# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1018 a_1381_125# a_987_409# a_1201_419# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.8795e+11p ps=1.98e+06u
-M1019 Q a_2865_74# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1020 a_1373_419# a_761_113# a_1201_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_2220_40# a_2193_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=3.2e+11p ps=2.64e+06u
-M1022 a_2019_419# a_987_409# a_1915_125# VNB nshort w=420000u l=150000u
-+  ad=3.3545e+11p pd=2.62e+06u as=0p ps=0u
-M1023 a_138_47# SCE a_27_409# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1024 a_245_409# SCD VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=5.7e+11p pd=5.14e+06u as=0p ps=0u
-M1025 a_1921_419# a_1201_419# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1423_99# a_1201_419# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_2019_419# SET_B VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_2172_66# a_761_113# a_2019_419# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1029 a_2250_66# a_2220_40# a_2172_66# VNB nshort w=420000u l=150000u
-+  ad=9.03e+10p pd=1.27e+06u as=0p ps=0u
-M1030 VGND a_2019_419# a_2951_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1031 a_458_409# D a_352_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1032 a_526_47# SCE a_352_409# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1033 VGND SCD a_526_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_987_409# a_761_113# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.75e+11p pd=2.55e+06u as=0p ps=0u
-M1035 a_2193_419# a_987_409# a_2019_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_2682_57# a_2019_419# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1037 VGND SET_B a_1729_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 Q_N a_2019_419# a_2682_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1039 a_987_409# a_761_113# a_1006_113# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1040 a_1006_113# a_761_113# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 Q a_2865_74# a_3109_74# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1042 a_848_113# CLK a_761_113# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1043 a_1201_419# a_761_113# a_352_409# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_2951_74# a_2019_419# a_2865_74# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1045 a_352_409# a_27_409# a_245_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 VPWR SCE a_458_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VPWR CLK a_761_113# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1048 VGND SET_B a_2250_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1201_419# a_987_409# a_1381_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_761_113# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_2019_419# a_987_409# a_2193_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_1729_125# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR SCD a_245_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_1423_99# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_2220_40# a_2019_419# a_2524_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_352_409# D a_458_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_458_409# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_2193_419# a_2220_40# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 a_352_409# SCE a_526_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR a_2019_419# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 VPWR a_2865_74# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X13 VPWR a_1201_419# a_1423_99# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X14 VGND a_761_113# a_1006_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_352_409# a_761_113# a_1201_419# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VGND a_1201_419# a_1915_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_27_409# SCE a_138_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_2250_66# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_27_409# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X20 a_1373_419# a_1423_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X21 a_138_47# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_2682_57# a_2019_419# Q_N VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_2172_66# a_2220_40# a_2250_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VPWR a_761_113# a_987_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X25 a_362_47# D a_352_409# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_848_113# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 VGND a_2865_74# a_3109_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 VPWR SET_B a_2019_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X29 a_1915_125# a_987_409# a_2019_419# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_1921_419# a_761_113# a_2019_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X31 a_245_409# a_27_409# a_352_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X32 a_352_409# a_987_409# a_1201_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X33 a_761_113# CLK a_848_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_1006_113# a_761_113# a_987_409# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 a_2865_74# a_2019_419# a_2951_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 VPWR a_1201_419# a_1921_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X37 a_2524_57# a_2019_419# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 a_1381_125# a_1423_99# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 a_1423_99# a_1201_419# a_1729_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X40 VGND a_2019_419# a_2682_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X41 a_2951_74# a_2019_419# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X42 a_1201_419# a_761_113# a_1373_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X43 VGND a_27_409# a_362_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X44 a_526_47# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X45 a_2019_419# a_761_113# a_2172_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X46 a_2865_74# a_2019_419# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X47 a_2220_40# a_2019_419# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X48 a_3109_74# a_2865_74# Q VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_1.cdl b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_1.cdl
index 89047c6..1f0a0ad 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_1.cdl
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_1.cdl
@@ -16,84 +16,84 @@
 
 .SUBCKT sky130_fd_sc_lp__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=0.64 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.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 net165 VPB phighvt m=1 w=1.26 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=1 w=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=1 w=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=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
-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 net189 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net196 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI47 clkpos clkneg 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 net165 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
-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.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 net165 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI660 Q net165 VPB pfet_01v8_hvt m=1 w=1.26 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=1 w=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=1 w=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=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
-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 net189 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net196 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net165 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net157 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net165 VNB nfet_01v8 m=1 w=0.84 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_lp__sdfstp_1
diff --git a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_1.netlist.tsv b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_1.netlist.tsv
index 7a9443b..090e126 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_1.netlist.tsv
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_1.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_lp__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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net165	S0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net165	VPWR	VPB	phighvt	1	1.26	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	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net84	M0	VPWR	VPB	phighvt	1	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	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
-MI34	MOSFET	S0	clkpos	net189	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	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	net189	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.42	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.42	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.84	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	0.64	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.64	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.26	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	1	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	1	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	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
+MI34	MOSFET	S0	clkpos	net189	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	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	net189	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.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.42	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.42	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.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
diff --git a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_1.spice b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_1.spice
index 786b48d..bfaee96 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_1.spice
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_1.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__sdfstp_1 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
-M1000 a_196_128# SCE a_124_128# VNB nshort w=420000u l=150000u
-+  ad=4.311e+11p pd=3.75e+06u as=8.82e+10p ps=1.26e+06u
-M1001 a_1912_463# a_871_47# a_1810_463# VPB phighvt w=420000u l=150000u
-+  ad=3.969e+11p pd=3.84e+06u as=2.95e+11p ps=3.19e+06u
-M1002 a_1912_463# a_871_47# a_1847_125# VNB nshort w=640000u l=150000u
-+  ad=4.629e+11p pd=2.95e+06u as=1.344e+11p ps=1.7e+06u
-M1003 a_282_128# D a_196_128# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 a_1263_31# a_1135_57# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.239e+11p pd=1.43e+06u as=2.11845e+12p ps=1.749e+07u
-M1005 VGND a_1912_463# a_2598_153# VNB nshort w=420000u l=150000u
-+  ad=1.4032e+12p pd=1.305e+07u as=1.113e+11p ps=1.37e+06u
-M1006 a_2116_125# a_702_47# a_1912_463# VNB nshort w=420000u l=150000u
-+  ad=1.638e+11p pd=1.62e+06u as=0p ps=0u
-M1007 a_1847_125# a_1135_57# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VPWR a_1912_463# a_2598_153# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1009 a_27_408# a_324_102# a_196_128# VPB phighvt w=640000u l=150000u
-+  ad=3.392e+11p pd=3.62e+06u as=3.609e+11p ps=3.43e+06u
-M1010 VPWR a_2158_231# a_1810_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_2158_231# a_1912_463# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1012 VGND SET_B a_2224_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1013 VPWR SCD a_27_408# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_124_128# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 Q a_2598_153# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1016 a_871_47# a_702_47# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1017 a_1703_379# a_702_47# a_1912_463# VPB phighvt w=840000u l=150000u
-+  ad=4.44375e+11p pd=4.42e+06u as=0p ps=0u
-M1018 a_1135_57# a_702_47# a_196_128# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1019 a_1221_57# a_871_47# a_1135_57# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1020 VPWR SET_B a_1263_31# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND SET_B a_1502_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.512e+11p ps=1.56e+06u
-M1022 VGND a_1263_31# a_1221_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1135_57# a_871_47# a_196_128# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1024 a_2224_125# a_2158_231# a_2116_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND CLK a_702_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1026 a_324_102# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1027 VPWR CLK a_702_47# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.459e+11p ps=2.7e+06u
-M1028 a_1221_463# a_702_47# a_1135_57# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1029 a_1703_379# a_1135_57# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Q a_2598_153# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1031 a_2158_231# a_1912_463# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1032 VPWR a_1263_31# a_1221_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_196_408# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1034 VGND a_324_102# a_282_128# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1912_463# SET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_196_128# D a_196_408# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_871_47# a_702_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1038 a_324_102# SCE VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1039 a_1502_125# a_1135_57# a_1263_31# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 VGND SCE a_324_102# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_124_128# SCE a_196_128# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_1810_463# a_871_47# a_1912_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_196_128# a_324_102# a_27_408# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 VPWR a_2598_153# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VPWR a_1912_463# a_2158_231# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 VGND SCD a_124_128# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_1810_463# a_2158_231# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_1502_125# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR SCE a_196_408# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X10 a_196_408# D a_196_128# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 a_282_128# a_324_102# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_1135_57# a_702_47# a_1221_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 VGND a_1135_57# a_1847_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X14 a_1221_463# a_1263_31# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 VPWR a_1135_57# a_1703_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 a_196_128# a_702_47# a_1135_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_1912_463# a_702_47# a_2116_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_27_408# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 a_1263_31# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 a_702_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 VGND a_702_47# a_871_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_1912_463# a_702_47# a_1703_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X23 a_1263_31# a_1135_57# a_1502_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VPWR SCE a_324_102# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X25 a_196_128# D a_282_128# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_2224_125# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_1221_57# a_1263_31# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_196_128# a_871_47# a_1135_57# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X29 VPWR SET_B a_1912_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X30 a_2598_153# a_1912_463# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X31 a_1847_125# a_871_47# a_1912_463# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X32 a_2116_125# a_2158_231# a_2224_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 VGND a_1912_463# a_2158_231# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_2598_153# a_1912_463# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 a_1135_57# a_871_47# a_1221_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 VPWR a_702_47# a_871_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X37 a_702_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X38 VGND a_2598_153# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X39 VPWR a_1135_57# a_1263_31# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.cdl b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.cdl
index ab84eb4..8aeeac8 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.cdl
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.cdl
@@ -16,84 +16,84 @@
 
 .SUBCKT sky130_fd_sc_lp__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=0.64 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.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 net165 VPB phighvt m=2 w=1.26 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=1 w=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=1 w=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=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
-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 net189 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.42 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.42 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=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 net165 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
-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.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 net165 VNB nshort m=2 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI660 Q net165 VPB pfet_01v8_hvt m=2 w=1.26 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=1 w=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=1 w=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=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
-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 net189 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI25 net157 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net165 VNB nfet_01v8 m=2 w=0.84 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_lp__sdfstp_2
diff --git a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.netlist.tsv b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.netlist.tsv
index 449c791..05fdf83 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.netlist.tsv
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_lp__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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net165	S0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net165	VPWR	VPB	phighvt	2	1.26	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	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net84	M0	VPWR	VPB	phighvt	1	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	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
-MI34	MOSFET	S0	clkpos	net189	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	net189	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.42	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.42	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.84	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	0.64	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.64	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.26	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	1	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	1	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	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
+MI34	MOSFET	S0	clkpos	net189	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	net189	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.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.42	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.42	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.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
diff --git a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.spice b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.spice
index f78ec7f..93350ce 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.spice
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.spice
@@ -16,88 +16,46 @@
 
 
 .subckt sky130_fd_sc_lp__sdfstp_2 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
-M1000 a_963_47# a_794_47# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=2.2253e+12p ps=1.978e+07u
-M1001 a_1327_415# a_794_47# a_1237_55# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1002 a_2159_125# a_794_47# a_1998_463# VNB nshort w=420000u l=150000u
-+  ad=1.155e+11p pd=1.39e+06u as=3.726e+11p ps=2.52e+06u
-M1003 a_2214_99# a_1998_463# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1004 VPWR SET_B a_1365_29# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.827e+11p ps=1.95e+06u
-M1005 VPWR a_1365_29# a_1327_415# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND a_1998_463# a_2686_131# VNB nshort w=420000u l=150000u
-+  ad=1.7896e+12p pd=1.6e+07u as=1.113e+11p ps=1.37e+06u
-M1007 a_1781_379# a_1237_55# VPWR VPB phighvt w=840000u l=150000u
-+  ad=4.44375e+11p pd=4.42e+06u as=0p ps=0u
-M1008 a_1998_463# a_963_47# a_1933_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.7e+06u
-M1009 VGND a_358_429# a_330_121# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1010 VGND CLK a_794_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1011 a_244_121# SCE a_172_121# VNB nshort w=420000u l=150000u
-+  ad=4.35e+11p pd=3.77e+06u as=8.82e+10p ps=1.26e+06u
-M1012 a_1998_463# SET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=3.969e+11p pd=3.84e+06u as=0p ps=0u
-M1013 a_1933_125# a_1237_55# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_358_429# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1015 a_330_121# D a_244_121# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_2244_125# a_2214_99# a_2159_125# VNB nshort w=420000u l=150000u
-+  ad=2.268e+11p pd=1.92e+06u as=0p ps=0u
-M1017 a_208_481# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1018 a_244_121# D a_208_481# VPB phighvt w=640000u l=150000u
-+  ad=4.743e+11p pd=3.97e+06u as=0p ps=0u
-M1019 VGND SET_B a_2244_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VPWR CLK a_794_47# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.129e+11p ps=2.66e+06u
-M1021 VGND a_2686_131# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1022 a_172_121# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_963_47# a_794_47# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1024 a_1608_125# a_1237_55# a_1365_29# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.281e+11p ps=1.45e+06u
-M1025 VPWR a_2214_99# a_1888_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=3.112e+11p ps=3.23e+06u
-M1026 a_358_429# SCE VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1027 VGND SET_B a_1608_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR a_2686_131# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1029 a_1237_55# a_963_47# a_244_121# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_1781_379# a_794_47# a_1998_463# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_2214_99# a_1998_463# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1032 a_1998_463# a_963_47# a_1888_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_39_481# a_358_429# a_244_121# VPB phighvt w=640000u l=150000u
-+  ad=3.392e+11p pd=3.62e+06u as=0p ps=0u
-M1034 a_1237_55# a_794_47# a_244_121# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1035 a_1323_55# a_963_47# a_1237_55# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1036 Q a_2686_131# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR SCD a_39_481# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VGND a_1365_29# a_1323_55# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 Q a_2686_131# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_1365_29# a_1237_55# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VPWR a_1998_463# a_2686_131# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
+X0 a_1237_55# a_794_47# a_1327_415# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_1327_415# a_1365_29# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_1365_29# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_208_481# D a_244_121# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 a_1888_463# a_963_47# a_1998_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 Q a_2686_131# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VPWR a_794_47# a_963_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 VPWR a_2686_131# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VGND SCD a_172_121# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR a_1998_463# a_2214_99# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 VPWR a_1237_55# a_1365_29# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 a_1998_463# a_794_47# a_1781_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X12 Q a_2686_131# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_244_121# D a_330_121# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_244_121# a_794_47# a_1237_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_2159_125# a_2214_99# a_2244_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_1365_29# a_1237_55# a_1608_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VPWR SCE a_358_429# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 a_2686_131# a_1998_463# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 a_244_121# a_963_47# a_1237_55# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 a_1323_55# a_1365_29# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 VGND a_1237_55# a_1933_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X22 a_330_121# a_358_429# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_794_47# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VGND a_794_47# a_963_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_2686_131# a_1998_463# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_244_121# a_358_429# a_39_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X27 VPWR SET_B a_1998_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X28 a_2244_125# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_1888_463# a_2214_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X30 VPWR SCE a_208_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X31 a_1608_125# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 a_794_47# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X33 VPWR a_1237_55# a_1781_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X34 a_1933_125# a_963_47# a_1998_463# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X35 VGND SCE a_358_429# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 a_1237_55# a_963_47# a_1323_55# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 VGND a_2686_131# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X38 a_39_481# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X39 a_172_121# SCE a_244_121# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X40 a_1998_463# a_794_47# a_2159_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X41 VGND a_1998_463# a_2214_99# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_4.cdl b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_4.cdl
index ba096ec..a23b4da 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_4.cdl
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_4.cdl
@@ -16,84 +16,84 @@
 
 .SUBCKT sky130_fd_sc_lp__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=0.64 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.26 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.26 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=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=1 w=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=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
-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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net196 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI47 clkpos clkneg 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 net165 S0 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-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.26 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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI660 Q net165 VPB pfet_01v8_hvt m=4 w=1.26 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=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=1 w=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=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
-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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net196 SET_B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net165 S0 VNB nfet_01v8 m=1 w=0.84 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.84 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_lp__sdfstp_4
diff --git a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_4.netlist.tsv b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_4.netlist.tsv
index d7cc3ed..3732bee 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_4.netlist.tsv
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_4.netlist.tsv
@@ -1,42 +1,42 @@
 sky130_fd_sc_lp__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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net165	S0	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net165	VPWR	VPB	phighvt	4	1.26	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	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net84	M0	VPWR	VPB	phighvt	1	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	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
-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	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	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.42	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.84	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.84	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	0.64	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.26	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.26	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	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	1	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	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
+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	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	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.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.42	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.84	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.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
diff --git a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_4.spice b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_4.spice
index 3d3585d..958a210 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_4.spice
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_4.spice
@@ -16,96 +16,50 @@
 
 
 .subckt sky130_fd_sc_lp__sdfstp_4 CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
-M1000 VGND a_346_93# a_304_119# VNB nshort w=420000u l=150000u
-+  ad=1.7677e+12p pd=1.701e+07u as=8.82e+10p ps=1.26e+06u
-M1001 a_346_93# SCE VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1002 a_1751_379# a_773_409# a_1960_125# VPB phighvt w=840000u l=150000u
-+  ad=4.452e+11p pd=4.42e+06u as=3.801e+11p ps=3.8e+06u
-M1003 a_1960_125# SET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.5593e+12p ps=2.281e+07u
-M1004 VGND a_2638_53# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.704e+11p ps=4.48e+06u
-M1005 a_961_491# a_773_409# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1006 VPWR a_2638_53# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1007 VGND a_1960_125# a_2638_53# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1008 a_1315_81# a_961_491# a_1211_463# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1009 a_218_119# SCE a_146_119# VNB nshort w=420000u l=150000u
-+  ad=3.843e+11p pd=3.51e+06u as=8.82e+10p ps=1.26e+06u
-M1010 a_1751_379# a_1211_463# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND a_1339_331# a_1315_81# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_196_479# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1013 a_304_119# D a_218_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_146_119# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_2205_231# a_1960_125# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1016 a_2248_125# a_2205_231# a_2163_125# VNB nshort w=420000u l=150000u
-+  ad=1.365e+11p pd=1.49e+06u as=1.155e+11p ps=1.39e+06u
-M1017 a_218_119# D a_196_479# VPB phighvt w=640000u l=150000u
-+  ad=4.743e+11p pd=3.97e+06u as=0p ps=0u
-M1018 VPWR SET_B a_1339_331# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.48e+06u
-M1019 VPWR a_2205_231# a_1858_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=3e+11p ps=3.23e+06u
-M1020 a_2163_125# a_773_409# a_1960_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=5.294e+11p ps=3.01e+06u
-M1021 Q a_2638_53# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1297_463# a_773_409# a_1211_463# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1023 a_961_491# a_773_409# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1024 VGND SET_B a_2248_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VPWR a_1339_331# a_1297_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_1960_125# a_961_491# a_1858_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1598_125# a_1211_463# a_1339_331# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1028 a_1888_125# a_1211_463# VGND VNB nshort w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1029 a_1339_331# a_1211_463# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 Q a_2638_53# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_27_479# a_346_93# a_218_119# VPB phighvt w=640000u l=150000u
-+  ad=3.392e+11p pd=3.62e+06u as=0p ps=0u
-M1032 VGND SET_B a_1598_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1211_463# a_961_491# a_218_119# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 Q a_2638_53# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_1960_125# a_961_491# a_1888_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 Q a_2638_53# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND CLK a_773_409# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1038 VPWR SCD a_27_479# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_346_93# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1040 VPWR a_1960_125# a_2638_53# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.339e+11p ps=3.05e+06u
-M1041 a_1211_463# a_773_409# a_218_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VPWR CLK a_773_409# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.329e+11p ps=2.82e+06u
-M1043 a_2205_231# a_1960_125# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1044 VPWR a_2638_53# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 VGND a_2638_53# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1960_125# a_773_409# a_1751_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 VPWR SET_B a_1960_125# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_1858_463# a_2205_231# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 Q a_2638_53# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 VGND a_2638_53# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VPWR a_2638_53# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND a_1960_125# a_2205_231# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_218_119# D a_304_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_1888_125# a_961_491# a_1960_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 a_1598_125# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND SCE a_346_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR a_2638_53# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_1858_463# a_961_491# a_1960_125# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X13 Q a_2638_53# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_2638_53# a_1960_125# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_1211_463# a_773_409# a_1297_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X16 a_1297_463# a_1339_331# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 a_1315_81# a_1339_331# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_218_119# a_961_491# a_1211_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 VGND SCD a_146_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VPWR a_1211_463# a_1751_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X21 Q a_2638_53# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 a_773_409# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X23 a_218_119# a_346_93# a_27_479# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X24 VPWR SCE a_346_93# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X25 a_2163_125# a_2205_231# a_2248_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_1339_331# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X27 VGND a_2638_53# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X28 VPWR SCE a_196_479# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X29 a_1960_125# a_773_409# a_2163_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_196_479# D a_218_119# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X31 VPWR a_1211_463# a_1339_331# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X32 a_773_409# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 a_218_119# a_773_409# a_1211_463# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 VGND a_1211_463# a_1888_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X35 Q a_2638_53# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X36 a_2638_53# a_1960_125# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X37 a_1211_463# a_961_491# a_1315_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 a_1339_331# a_1211_463# a_1598_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 a_146_119# SCE a_218_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X40 VGND a_773_409# a_961_491# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X41 a_2248_125# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X42 VPWR a_773_409# a_961_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X43 a_27_479# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X44 a_304_119# a_346_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X45 VPWR a_1960_125# a_2205_231# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.cdl b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.cdl
index 3c920b4..e97a67a 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.cdl
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.cdl
@@ -16,96 +16,96 @@
 
 .SUBCKT sky130_fd_sc_lp__sdfstp_lp 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=1 l=0.25 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=1 l=0.25 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.25 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net189 S0 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
-MI660 Q net189 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
-MI659 M1 SET_B 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
-MI662 net108 M1 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
-MI664 M0 clkneg 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
-MI6 net100 S1 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
-MI669 S0 clkpos 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
-MI24 S0 SET_B 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
-MI648 S1 S0 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
-MI38 S0 clkneg 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
-MI37 net88 M0 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
-MI43 db clkpos 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
-MI45 clkneg CLK 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
-MI101 db sceb 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
-MI107 p0 SCE 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
-MI94 db D 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
-MI108 p1 SCD 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
-MI34 S0 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
-MI27 net237 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 net228 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
-MI677 net188 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
-MI36 net213 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
-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.42 l=0.15 mult=1 sa=0.265
+MI645 sceb SCE 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
-MI44 clkneg CLK VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI658 M1 M0 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
-MI657 net224 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 l=0.25 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI652 net189 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
-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
-MI675 net181 net189 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI663 net189 S0 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
-MI25 net177 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI660 Q net189 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
-MI674 net173 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
-MI673 net169 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
-MI672 net165 CLK VNB nshort m=1 w=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 net189 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI671 net157 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI659 M1 SET_B 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
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI662 net108 M1 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
+MI664 M0 clkneg 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
+MI6 net100 S1 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
+MI669 S0 clkpos 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
+MI24 S0 SET_B 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
+MI648 S1 S0 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
+MI38 S0 clkneg 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
+MI37 net88 M0 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
+MI43 db clkpos 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
+MI45 clkneg CLK 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
+MI101 db sceb 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
+MI107 p0 SCE 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
+MI94 db D 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
+MI108 p1 SCD 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
+MI34 S0 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
+MI27 net237 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 net228 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
+MI677 net188 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
+MI36 net213 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
+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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net224 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 net189 S0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI644 sceb SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI675 net181 net189 VNB nfet_01v8 m=1 w=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 net177 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
+MI674 net173 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
+MI673 net169 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
+MI672 net165 CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 Q net189 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI671 net157 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 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_lp__sdfstp_lp
diff --git a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.netlist.tsv b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.netlist.tsv
index eae9189..8976531 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.netlist.tsv
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.netlist.tsv
@@ -1,48 +1,48 @@
 sky130_fd_sc_lp__sdfstp_lp	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	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net189	S0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net189	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M1	SET_B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net108	M1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkneg	net108	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net100	S1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkpos	net100	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	S0	SET_B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	S0	clkneg	net88	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net88	M0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	db	clkpos	M0	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	S0	clkpos	net213	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net237	S1	net177	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	net173	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkpos	net228	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net224	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net228	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	net188	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net213	M0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net237	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	net157	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkneg	CLK	net165	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net224	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net189	S0	net188	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	sceb	SCE	net169	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	net181	net189	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI25	MOSFET	net177	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI674	MOSFET	net173	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI673	MOSFET	net169	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI672	MOSFET	net165	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net189	net181	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI671	MOSFET	net157	clkneg	VGND	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
+MI645	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net189	S0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net189	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M1	SET_B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net108	M1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkneg	net108	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net100	S1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkpos	net100	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	S0	SET_B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	S0	clkneg	net88	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net88	M0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	S0	clkpos	net213	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net237	S1	net177	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	net173	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkpos	net228	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net224	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net228	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	net188	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net213	M0	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	net237	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	net157	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkneg	CLK	net165	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net224	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	net189	S0	net188	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	sceb	SCE	net169	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI675	MOSFET	net181	net189	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI25	MOSFET	net177	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI674	MOSFET	net173	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI673	MOSFET	net169	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI672	MOSFET	net165	CLK	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net189	net181	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI671	MOSFET	net157	clkneg	VGND	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
diff --git a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.spice b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.spice
index 6d1c112..611835d 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.spice
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.spice
@@ -16,96 +16,50 @@
 
 
 .subckt sky130_fd_sc_lp__sdfstp_lp CLK D SCD SCE SET_B VGND VNB VPB VPWR Q
-M1000 a_245_406# SCD VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=5.7e+11p pd=5.14e+06u as=3.3553e+12p ps=2.281e+07u
-M1001 a_458_406# D a_352_406# VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=5.55e+11p ps=5.11e+06u
-M1002 VPWR CLK a_750_108# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1003 VPWR a_2006_125# a_2767_57# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1004 VGND SCE a_144_47# VNB nshort w=420000u l=150000u
-+  ad=1.24265e+12p pd=1.281e+07u as=8.82e+10p ps=1.26e+06u
-M1005 a_2584_57# a_2006_125# a_2172_40# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1006 VPWR SCE a_27_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1007 VGND a_2006_125# a_2584_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_1928_125# a_1199_419# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1009 VPWR a_1425_99# a_1371_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1010 VPWR SET_B a_1425_99# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1011 a_2006_125# a_750_108# a_1928_419# VPB phighvt w=1e+06u l=250000u
-+  ad=9.35e+11p pd=5.87e+06u as=2.4e+11p ps=2.48e+06u
-M1012 VGND a_2006_125# a_2854_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1013 a_2206_419# a_986_409# a_2006_125# VPB phighvt w=1e+06u l=250000u
-+  ad=2.9e+11p pd=2.58e+06u as=0p ps=0u
-M1014 VGND SET_B a_1736_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1015 VPWR a_2006_125# a_2172_40# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1016 a_352_406# a_27_409# a_245_406# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_144_47# SCE a_27_409# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1018 VPWR SCE a_458_406# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1199_419# a_986_409# a_352_406# VPB phighvt w=1e+06u l=250000u
-+  ad=6.1e+11p pd=3.22e+06u as=0p ps=0u
-M1020 a_1199_419# a_750_108# a_352_406# VNB nshort w=420000u l=150000u
-+  ad=1.722e+11p pd=1.66e+06u as=2.373e+11p ps=2.81e+06u
-M1021 a_2006_125# SET_B VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_368_47# a_27_409# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1023 a_352_406# D a_368_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND SCD a_532_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1025 a_1736_125# a_1199_419# a_1425_99# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1026 Q a_2767_57# a_3012_57# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1027 a_2854_57# a_2006_125# a_2767_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1028 a_1371_419# a_750_108# a_1199_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VGND CLK a_837_108# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1030 a_986_409# a_750_108# a_1001_108# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1031 a_1001_108# a_750_108# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_3012_57# a_2767_57# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR a_2172_40# a_2206_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND a_1425_99# a_1383_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1035 a_986_409# a_750_108# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.7e+11p pd=2.54e+06u as=0p ps=0u
-M1036 a_1425_99# a_1199_419# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Q a_2767_57# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1038 VGND SET_B a_2202_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1039 a_2124_66# a_750_108# a_2006_125# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.7035e+11p ps=2.31e+06u
-M1040 a_2202_66# a_2172_40# a_2124_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_837_108# CLK a_750_108# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1042 a_2006_125# a_986_409# a_1928_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_1928_419# a_1199_419# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_532_47# SCE a_352_406# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_1383_125# a_986_409# a_1199_419# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_750_108# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_2006_125# a_986_409# a_2206_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_1425_99# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 VPWR SET_B a_2006_125# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 VPWR a_1199_419# a_1928_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 VGND a_27_409# a_368_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_352_406# a_750_108# a_1199_419# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_2767_57# a_2006_125# a_2854_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_2767_57# a_2006_125# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_2584_57# a_2006_125# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_245_406# a_27_409# a_352_406# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 VPWR a_1199_419# a_1425_99# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 a_2854_57# a_2006_125# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_1928_419# a_750_108# a_2006_125# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X14 VGND a_2767_57# a_3012_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_352_406# a_986_409# a_1199_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X16 a_1001_108# a_750_108# a_986_409# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_1736_125# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_1371_419# a_1425_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X19 a_2124_66# a_2172_40# a_2202_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_27_409# SCE a_144_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_27_409# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X22 a_3012_57# a_2767_57# Q VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_144_47# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_1383_125# a_1425_99# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 VGND a_1199_419# a_1928_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VPWR a_750_108# a_986_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X27 a_1425_99# a_1199_419# a_1736_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_2172_40# a_2006_125# a_2584_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_837_108# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_1199_419# a_986_409# a_1383_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 VPWR SCD a_245_406# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X32 a_1928_125# a_986_409# a_2006_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 VPWR a_2767_57# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X34 a_2006_125# a_750_108# a_2124_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 a_352_406# D a_458_406# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X36 a_1199_419# a_750_108# a_1371_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X37 a_368_47# D a_352_406# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 a_352_406# SCE a_532_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 a_458_406# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X40 a_750_108# CLK a_837_108# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X41 a_2172_40# a_2006_125# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X42 a_2206_419# a_2172_40# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X43 a_532_47# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X44 VGND a_750_108# a_1001_108# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X45 a_2202_66# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_1.cdl b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_1.cdl
index 97df6a4..e373ee3 100644
--- a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_1.cdl
+++ b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_1.cdl
@@ -16,76 +16,76 @@
 
 .SUBCKT sky130_fd_sc_lp__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
-MI652 M1 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
-MI649 S1 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
-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.42 l=0.15 mult=1 sa=0.265
+MI652 M1 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
-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.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB 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
-MI656 net155 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 net151 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.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 net203 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI662 net203 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
-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.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
-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 net206 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 net243 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.26 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
-MI660 Q_N net203 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB phighvt m=1 w=0.64 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
-MI637 clkpos clkneg VPB phighvt m=1 w=0.64 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
-MI650 S1 S0 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 net155 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 net151 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.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
+MI661 Q_N net203 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net203 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
+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.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
+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 net206 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 net243 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.26 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
+MI660 Q_N net203 VPB pfet_01v8_hvt m=1 w=1.26 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=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=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 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
+MI647 net203 S1 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 pfet_01v8_hvt m=1 w=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
-MI647 net203 S1 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
-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_lp__sdfxbp_1
diff --git a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_1.netlist.tsv b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_1.netlist.tsv
index 475ee32..995fee7 100644
--- a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_1.netlist.tsv
+++ b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_1.netlist.tsv
@@ -1,38 +1,38 @@
 sky130_fd_sc_lp__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
-MI652	MOSFET	M1	clkpos	S0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	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.42	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	net155	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net155	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net151	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net203	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net203	S1	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
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net151	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	net206	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	net243	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.26	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	net243	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q_N	net203	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	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	0.64	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	net206	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	net203	S1	VPWR	VPB	phighvt	1	0.64	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	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.42	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	net155	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net155	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net151	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net203	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net203	S1	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
+MI635	MOSFET	clkneg	CLK	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	net151	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	net206	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	net243	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.26	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	net243	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	net203	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	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	0.64	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	net206	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	net203	S1	VPWR	VPB	pfet_01v8_hvt	1	0.64	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/sdfxbp/sky130_fd_sc_lp__sdfxbp_1.spice b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_1.spice
index e0d4af2..b5e3263 100644
--- a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_1.spice
+++ b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_1.spice
@@ -16,76 +16,40 @@
 
 
 .subckt sky130_fd_sc_lp__sdfxbp_1 CLK D SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 a_196_119# D a_196_483# VPB phighvt w=640000u l=150000u
-+  ad=3.325e+11p pd=3.41e+06u as=1.344e+11p ps=1.7e+06u
-M1001 VGND a_324_431# a_304_119# VNB nshort w=420000u l=150000u
-+  ad=1.4078e+12p pd=1.275e+07u as=8.82e+10p ps=1.26e+06u
-M1002 a_1873_497# a_1075_95# a_1786_497# VPB phighvt w=420000u l=150000u
-+  ad=3.3505e+11p pd=2.96e+06u as=2.31e+11p ps=2.78e+06u
-M1003 a_324_431# SCE VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1004 VPWR a_722_23# a_767_121# VPB phighvt w=840000u l=150000u
-+  ad=1.9951e+12p pd=1.767e+07u as=5.625e+11p ps=4.91e+06u
-M1005 VGND a_722_23# a_767_121# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.937e+11p ps=3.22e+06u
-M1006 VPWR a_2082_99# a_1786_497# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_2082_99# a_1873_497# VGND VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1008 VPWR SCE a_324_431# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.328e+11p ps=2.32e+06u
-M1009 Q_N a_2409_367# VGND VNB nshort w=840000u l=150000u
-+  ad=2.814e+11p pd=2.35e+06u as=0p ps=0u
-M1010 a_722_23# a_1075_95# a_196_119# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1011 VGND a_2082_99# a_2040_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1012 a_124_119# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1013 VGND a_1161_95# a_1075_95# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1014 a_304_119# D a_196_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.751e+11p ps=2.99e+06u
-M1015 a_2040_125# a_1161_95# a_1873_497# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1016 a_1161_95# CLK VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1017 VPWR SCD a_27_483# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.392e+11p ps=3.62e+06u
-M1018 a_722_23# a_1075_95# a_1033_121# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=8.82e+10p ps=1.26e+06u
-M1019 a_196_119# a_1161_95# a_722_23# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_27_483# a_324_431# a_196_119# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1033_121# a_767_121# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_2082_99# a_1873_497# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1023 a_974_425# a_767_121# VPWR VPB phighvt w=420000u l=150000u
-+  ad=4.011e+11p pd=3.93e+06u as=0p ps=0u
-M1024 Q a_2082_99# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1025 VGND a_2082_99# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.226e+11p ps=2.21e+06u
-M1026 Q_N a_2409_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1027 a_974_425# a_1161_95# a_722_23# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR a_1161_95# a_1075_95# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1029 a_1873_497# a_1075_95# a_767_121# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_2409_367# a_2082_99# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1031 a_196_119# SCE a_124_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_196_483# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1161_95# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1034 VPWR a_2082_99# a_2409_367# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1035 a_767_121# a_1161_95# a_1873_497# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND CLK a_1161_95# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_1033_121# a_1075_95# a_722_23# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_2040_125# a_2082_99# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_196_119# D a_304_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR a_2409_367# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND a_2409_367# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VGND a_2082_99# a_2409_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND SCE a_324_431# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_196_119# a_1075_95# a_722_23# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_1075_95# a_1161_95# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VPWR a_2082_99# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VPWR a_767_121# a_974_425# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X12 VGND a_1873_497# a_2082_99# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X13 VPWR CLK a_1161_95# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 a_1786_497# a_1075_95# a_1873_497# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 a_722_23# a_1161_95# a_196_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_1873_497# a_1161_95# a_767_121# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X17 a_722_23# a_1161_95# a_974_425# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 VPWR SCE a_196_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 a_196_483# D a_196_119# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 a_767_121# a_722_23# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X21 a_1786_497# a_2082_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 VPWR a_1873_497# a_2082_99# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X23 a_27_483# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X24 VGND a_767_121# a_1033_121# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_767_121# a_1075_95# a_1873_497# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_324_431# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X27 a_1873_497# a_1161_95# a_2040_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_2409_367# a_2082_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X29 a_196_119# a_324_431# a_27_483# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X30 a_124_119# SCE a_196_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_767_121# a_722_23# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X32 a_304_119# a_324_431# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 VGND SCD a_124_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_1075_95# a_1161_95# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X35 Q a_2082_99# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.cdl b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.cdl
index dcd5c3e..d8b5f0b 100644
--- a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.cdl
+++ b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.cdl
@@ -16,76 +16,76 @@
 
 .SUBCKT sky130_fd_sc_lp__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
-MI652 M1 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
-MI649 S1 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
-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.42 l=0.15 mult=1 sa=0.265
+MI652 M1 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
-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.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB 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
-MI656 net155 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 net151 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.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 net203 VNB nshort 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
-MI662 net203 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
-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.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
-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 net206 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 net243 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.26 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
-MI660 Q_N net203 VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI638 clkneg CLK VPB phighvt m=1 w=0.64 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
-MI637 clkpos clkneg VPB phighvt m=1 w=0.64 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
-MI650 S1 S0 VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 net155 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 net151 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.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
+MI661 Q_N net203 VNB nfet_01v8 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
+MI662 net203 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
+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.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
+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 net206 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 net243 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.26 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
+MI660 Q_N net203 VPB pfet_01v8_hvt m=2 w=1.26 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=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=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 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
+MI647 net203 S1 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 pfet_01v8_hvt m=1 w=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
-MI647 net203 S1 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
-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_lp__sdfxbp_2
diff --git a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.netlist.tsv b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.netlist.tsv
index a6d5fdb..28b0024 100644
--- a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.netlist.tsv
+++ b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.netlist.tsv
@@ -1,38 +1,38 @@
 sky130_fd_sc_lp__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
-MI652	MOSFET	M1	clkpos	S0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	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.42	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	net155	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net155	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net151	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net203	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net203	S1	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
-MI635	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net151	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	net206	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	net243	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.26	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	net243	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q_N	net203	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	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	0.64	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	net206	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	net203	S1	VPWR	VPB	phighvt	1	0.64	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	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.42	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	net155	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net155	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net151	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net203	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net203	S1	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
+MI635	MOSFET	clkneg	CLK	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	net151	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	net206	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	net243	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.26	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	net243	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	net203	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	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	0.64	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	net206	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	net203	S1	VPWR	VPB	pfet_01v8_hvt	1	0.64	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/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.spice b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.spice
index 48fea85..d2fe33b 100644
--- a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.spice
+++ b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__sdfxbp_2 CLK D SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 VGND a_2122_329# a_2097_122# VNB nshort w=420000u l=150000u
-+  ad=2.1442e+12p pd=1.874e+07u as=8.82e+10p ps=1.26e+06u
-M1001 a_1188_93# CLK VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=2.7553e+12p ps=2.403e+07u
-M1002 Q a_2122_329# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1003 a_332_94# SCE VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1004 VPWR a_733_21# a_778_399# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=6.131e+11p ps=4.99e+06u
-M1005 VPWR SCE a_332_94# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.976e+11p ps=2.21e+06u
-M1006 a_268_120# D a_182_120# VNB nshort w=420000u l=150000u
-+  ad=1.344e+11p pd=1.48e+06u as=2.289e+11p ps=2.77e+06u
-M1007 a_2710_56# a_2122_329# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1008 VPWR a_2710_56# Q_N VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1009 a_204_489# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1010 a_182_120# a_1188_93# a_733_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1011 a_2008_122# a_1188_93# a_778_399# VPB phighvt w=840000u l=150000u
-+  ad=2.709e+11p pd=2.4e+06u as=0p ps=0u
-M1012 Q_N a_2710_56# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1013 VGND a_733_21# a_778_399# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.809e+11p ps=3.18e+06u
-M1014 a_182_120# D a_204_489# VPB phighvt w=640000u l=150000u
-+  ad=3.325e+11p pd=3.41e+06u as=0p ps=0u
-M1015 a_2097_122# a_1188_93# a_2008_122# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.239e+11p ps=1.43e+06u
-M1016 VGND a_1188_93# a_1102_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1017 a_733_21# a_1102_93# a_1060_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1018 a_1188_93# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1019 VGND a_2122_329# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_182_120# SCE a_110_120# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1021 a_2008_122# a_1102_93# a_778_399# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_2122_329# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1023 VPWR SCD a_27_489# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.392e+11p ps=3.62e+06u
-M1024 a_993_425# a_1188_93# a_733_21# VPB phighvt w=420000u l=150000u
-+  ad=3.785e+11p pd=3.97e+06u as=1.176e+11p ps=1.4e+06u
-M1025 a_2122_329# a_2008_122# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1026 VGND a_332_94# a_268_120# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_1188_93# a_1102_93# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.56e+11p ps=2.08e+06u
-M1028 Q_N a_2710_56# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_2710_56# a_2122_329# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1030 VGND a_2710_56# Q_N VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_1060_119# a_778_399# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_2122_329# a_2008_122# VGND VNB nshort w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1033 a_993_425# a_778_399# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_2116_463# a_1102_93# a_2008_122# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1035 a_110_120# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR a_2122_329# a_2116_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 Q a_2122_329# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_27_489# a_332_94# a_182_120# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_733_21# a_1102_93# a_182_120# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_778_399# a_733_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X1 VPWR SCE a_204_489# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_182_120# D a_268_120# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_1102_93# a_1188_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_2008_122# a_2122_329# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_204_489# D a_182_120# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 a_182_120# a_1102_93# a_733_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 Q a_2122_329# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_1102_93# a_1188_93# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 a_2097_122# a_2122_329# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VPWR a_2122_329# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VGND SCE a_332_94# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_1060_119# a_1102_93# a_733_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_110_120# SCE a_182_120# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_182_120# a_332_94# a_27_489# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X15 VGND CLK a_1188_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_2008_122# a_1188_93# a_2097_122# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND a_2122_329# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 VGND a_2122_329# a_2710_56# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_733_21# a_1188_93# a_993_425# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 VGND SCD a_110_120# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_268_120# a_332_94# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 VGND a_778_399# a_1060_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 Q a_2122_329# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 VPWR a_2008_122# a_2122_329# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X25 VGND a_2710_56# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 a_733_21# a_1188_93# a_182_120# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_778_399# a_733_21# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X28 Q_N a_2710_56# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 a_27_489# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X30 VPWR CLK a_1188_93# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X31 a_2008_122# a_1102_93# a_2116_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X32 VPWR a_2710_56# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X33 a_2116_463# a_2122_329# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X34 a_332_94# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X35 a_778_399# a_1188_93# a_2008_122# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X36 VPWR a_778_399# a_993_425# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X37 Q_N a_2710_56# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X38 a_778_399# a_1102_93# a_2008_122# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 VPWR a_2122_329# a_2710_56# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.cdl b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.cdl
index 71ab731..1cc83a6 100644
--- a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.cdl
+++ b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.cdl
@@ -16,92 +16,92 @@
 
 .SUBCKT sky130_fd_sc_lp__sdfxbp_lp 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
-MI652 M1 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
-MI649 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
-MI634 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
-MI672 net80 net173 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI652 M1 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI649 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
+MI634 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
+MI672 net80 net173 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI671 net129 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
-MI670 net125 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
-MI669 net121 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
-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
-MI668 net113 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
-MI667 net109 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
-MI666 net132 clkneg 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.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 net101 CLK VNB nshort m=1 w=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
-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
-MI641 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
-MI646 Q 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
-MI661 Q_N net173 VNB nshort m=1 w=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 net173 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
-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.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
-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 net221 S1 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
-MI640 sceb SCE 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
-MI658 net213 M1 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
-MI645 Q S1 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
-MI651 db clkpos 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
-MI653 M1 clkneg 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
-MI659 M0 clkneg 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
-MI660 Q_N net173 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
-MI638 clkneg CLK 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
-MI637 clkpos clkneg VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265
+MI671 net129 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
-MI650 S1 S0 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI670 net125 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
+MI669 net121 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
+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
+MI668 net113 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
+MI667 net109 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
+MI666 net132 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
+MI665 net101 CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 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 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
+MI641 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
+MI646 Q 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
-MI644 S0 clkpos VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI661 Q_N net173 VNB nfet_01v8 m=1 w=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 net173 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
+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.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
+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 net221 S1 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
+MI640 sceb SCE 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
+MI658 net213 M1 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
+MI645 Q S1 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
-MI647 net173 S1 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI651 db clkpos 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
+MI653 M1 clkneg 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
+MI659 M0 clkneg 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
+MI660 Q_N net173 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
+MI638 clkneg CLK 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
+MI637 clkpos clkneg 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
+MI650 S1 S0 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
-MI664 M1 M0 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI644 S0 clkpos 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
+MI647 net173 S1 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
+MI664 M1 M0 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
-MI107 p0 SCE VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI107 p0 SCE 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
-MI94 db D 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
-MI108 p1 SCD VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI94 db D 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
-MI101 db sceb VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI108 p1 SCD 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
+MI101 db sceb 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_lp__sdfxbp_lp
diff --git a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.netlist.tsv b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.netlist.tsv
index 03c15be..37af70f 100644
--- a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.netlist.tsv
+++ b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.netlist.tsv
@@ -1,46 +1,46 @@
 sky130_fd_sc_lp__sdfxbp_lp	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
-MI652	MOSFET	M1	clkpos	S0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	net121	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	net113	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI672	MOSFET	net80	net173	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	net132	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI671	MOSFET	net129	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net125	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	net121	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	sceb	SCE	net109	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI668	MOSFET	net113	M0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI667	MOSFET	net109	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	net132	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	net101	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-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
-MI641	MOSFET	net89	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	net125	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	net173	net80	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net173	S1	net129	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
-MI635	MOSFET	clkneg	CLK	net101	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net89	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	net221	S1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net213	M1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net213	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q_N	net173	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net221	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	net173	S1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M1	M0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	net121	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	net113	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI672	MOSFET	net80	net173	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	net132	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI671	MOSFET	net129	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net125	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	net121	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	sceb	SCE	net109	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI668	MOSFET	net113	M0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI667	MOSFET	net109	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	net132	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	net101	CLK	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	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
+MI641	MOSFET	net89	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	net125	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	net173	net80	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net173	S1	net129	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
+MI635	MOSFET	clkneg	CLK	net101	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net89	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	net221	S1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI640	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net213	M1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net213	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q_N	net173	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net221	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	net173	S1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.spice b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.spice
index 2507ea7..777758a 100644
--- a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.spice
+++ b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.spice
@@ -16,92 +16,48 @@
 
 
 .subckt sky130_fd_sc_lp__sdfxbp_lp CLK D SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 a_2089_254# a_1902_347# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=2.46805e+12p ps=1.9e+07u
-M1001 VGND a_2089_254# a_1859_155# VNB nshort w=420000u l=150000u
-+  ad=1.0001e+12p pd=1.081e+07u as=2.247e+11p ps=2.75e+06u
-M1002 a_2089_254# a_1902_347# a_2331_57# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1003 a_343_417# D a_337_125# VNB nshort w=420000u l=150000u
-+  ad=2.751e+11p pd=2.99e+06u as=1.008e+11p ps=1.32e+06u
-M1004 a_947_66# a_706_66# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1005 VPWR CLK a_706_66# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1006 VPWR SCE a_449_417# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.2e+11p ps=2.44e+06u
-M1007 VPWR a_1530_231# a_1482_347# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1008 VGND SCE a_141_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1009 VGND a_1530_231# a_1127_155# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.654e+11p ps=3.42e+06u
-M1010 a_1278_155# a_975_347# a_343_417# VPB phighvt w=1e+06u l=250000u
-+  ad=2.8e+11p pd=2.56e+06u as=5.65e+11p ps=5.13e+06u
-M1011 a_2714_401# a_2089_254# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1012 VGND SCD a_523_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1013 a_1530_231# a_1278_155# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=4.9e+11p pd=2.98e+06u as=0p ps=0u
-M1014 a_1278_155# a_975_347# a_1127_155# VNB nshort w=420000u l=150000u
-+  ad=1.218e+11p pd=1.42e+06u as=0p ps=0u
-M1015 a_337_125# a_27_409# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_2331_57# a_1902_347# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VPWR SCE a_27_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.7e+11p ps=2.54e+06u
-M1018 a_1530_231# a_1278_155# a_1674_125# VNB nshort w=420000u l=150000u
-+  ad=3.9245e+11p pd=4.01e+06u as=8.82e+10p ps=1.26e+06u
-M1019 a_449_417# D a_343_417# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_523_125# SCE a_343_417# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VGND CLK a_789_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1022 a_1530_231# a_975_347# a_1902_347# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.449e+11p ps=1.53e+06u
-M1023 a_2714_401# a_2089_254# a_2751_127# VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=8.82e+10p ps=1.26e+06u
-M1024 a_1902_347# a_706_66# a_1530_231# VPB phighvt w=1e+06u l=250000u
-+  ad=4.4725e+11p pd=2.93e+06u as=0p ps=0u
-M1025 VGND a_2089_254# a_2593_127# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1026 Q_N a_2714_401# a_3015_57# VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=8.82e+10p ps=1.26e+06u
-M1027 Q_N a_2714_401# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1028 a_1674_125# a_1278_155# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_2751_127# a_2089_254# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_975_347# a_706_66# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1031 a_3015_57# a_2714_401# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VPWR a_2089_254# Q VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1033 a_2040_352# a_975_347# a_1902_347# VPB phighvt w=1e+06u l=250000u
-+  ad=2.45e+11p pd=2.49e+06u as=0p ps=0u
-M1034 VPWR a_2089_254# a_2040_352# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_789_66# CLK a_706_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1036 a_343_417# a_27_409# a_239_417# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=5.55e+11p ps=5.11e+06u
-M1037 a_141_125# SCE a_27_409# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1038 a_1482_347# a_706_66# a_1278_155# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_975_347# a_706_66# a_947_66# VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1040 a_239_417# SCD VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_343_417# a_706_66# a_1278_155# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 a_1902_347# a_706_66# a_1859_155# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_2593_127# a_2089_254# Q VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 a_1859_155# a_2089_254# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_2751_127# a_2089_254# a_2714_401# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_1278_155# a_706_66# a_1482_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_2040_352# a_2089_254# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_1127_155# a_975_347# a_1278_155# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_1902_347# a_2331_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR a_2714_401# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_2331_57# a_1902_347# a_2089_254# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_1482_347# a_1530_231# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_706_66# CLK a_789_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_27_409# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 a_343_417# a_975_347# a_1278_155# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 a_27_409# SCE a_141_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_1674_125# a_1278_155# a_1530_231# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_1902_347# a_975_347# a_2040_352# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X15 a_2593_127# a_2089_254# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VGND a_2714_401# a_3015_57# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VGND a_1278_155# a_1674_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VPWR SCD a_239_417# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X19 a_141_125# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_239_417# a_27_409# a_343_417# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X21 VPWR a_1278_155# a_1530_231# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X22 a_1530_231# a_706_66# a_1902_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X23 a_3015_57# a_2714_401# Q_N VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VPWR a_706_66# a_975_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X25 a_789_66# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 Q a_2089_254# a_2593_127# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_337_125# D a_343_417# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_1859_155# a_706_66# a_1902_347# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 VPWR a_1902_347# a_2089_254# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X30 VPWR a_2089_254# a_2714_401# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X31 VGND a_2089_254# a_2751_127# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 a_523_125# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 a_706_66# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X34 a_1902_347# a_975_347# a_1530_231# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 Q a_2089_254# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X36 VGND a_27_409# a_337_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 VGND a_706_66# a_947_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 a_343_417# SCE a_523_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 a_1127_155# a_1530_231# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X40 a_449_417# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X41 a_1278_155# a_706_66# a_343_417# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X42 a_947_66# a_706_66# a_975_347# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X43 a_343_417# D a_449_417# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.cdl b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.cdl
index 7d3ad6b..ddecc1a 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.cdl
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 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.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.42 l=0.15 mult=1 sa=0.265
+MI652 M1 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
-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.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB 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
-MI656 net155 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 net151 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.84 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.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
-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 net206 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 net243 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.26 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=0.64 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB phighvt m=1 w=0.64 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 net155 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 net151 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.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
+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.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
+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 net206 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 net243 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.26 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=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=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 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_lp__sdfxtp_1
diff --git a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.netlist.tsv b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.netlist.tsv
index b369fb1..1ba9fd5 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.netlist.tsv
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_lp__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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	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.42	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	net155	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net155	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net151	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.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net151	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	net206	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	net243	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.26	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	net243	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	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	net206	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	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.42	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	net155	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net155	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net151	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.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net151	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	net206	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	net243	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.26	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	net243	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	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	0.64	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	net206	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_lp__sdfxtp_1.spice b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.spice
index 570beb0..a75dea5 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.spice
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.spice
@@ -16,68 +16,36 @@
 
 
 .subckt sky130_fd_sc_lp__sdfxtp_1 CLK D SCD SCE VGND VNB VPB VPWR Q
-M1000 a_1657_383# a_1459_449# VGND VNB nshort w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=1.1765e+12p ps=1.101e+07u
-M1001 a_1657_383# a_1459_449# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=1.6975e+12p ps=1.449e+07u
-M1002 a_1051_125# a_823_47# a_319_123# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.905e+11p ps=3.21e+06u
-M1003 a_1201_99# a_1051_125# VGND VNB nshort w=640000u l=150000u
-+  ad=2.966e+11p pd=2.38e+06u as=0p ps=0u
-M1004 a_823_47# a_628_123# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1005 Q a_1657_383# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1006 a_319_123# D a_247_123# VNB nshort w=420000u l=150000u
-+  ad=3.528e+11p pd=3.36e+06u as=8.82e+10p ps=1.26e+06u
-M1007 VPWR SCD a_441_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.048e+11p ps=1.92e+06u
-M1008 a_1459_449# a_628_123# a_1201_99# VPB phighvt w=840000u l=150000u
-+  ad=3.696e+11p pd=2.94e+06u as=2.352e+11p ps=2.24e+06u
-M1009 a_628_123# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1010 a_247_123# a_78_123# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_441_491# a_78_123# a_319_123# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_1137_125# a_823_47# a_1051_125# VNB nshort w=420000u l=150000u
-+  ad=1.344e+11p pd=1.48e+06u as=1.176e+11p ps=1.4e+06u
-M1013 a_1201_99# a_1051_125# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_1459_449# a_823_47# a_1201_99# VNB nshort w=420000u l=150000u
-+  ad=2.583e+11p pd=2.07e+06u as=0p ps=0u
-M1015 VPWR a_1201_99# a_1157_449# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=9.24e+10p ps=1.28e+06u
-M1016 VGND SCD a_464_123# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1017 VGND SCE a_78_123# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1018 a_1051_125# a_628_123# a_319_123# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 Q a_1657_383# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1020 VPWR SCE a_78_123# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1021 a_1615_495# a_823_47# a_1459_449# VPB phighvt w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1022 VPWR a_1657_383# a_1615_495# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_283_491# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1024 a_823_47# a_628_123# VPWR VPB phighvt w=640000u l=150000u
-+  ad=3.2e+11p pd=2.28e+06u as=0p ps=0u
-M1025 a_1664_65# a_628_123# a_1459_449# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1026 VGND a_1657_383# a_1664_65# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_628_123# CLK VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1028 a_319_123# D a_283_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1157_449# a_628_123# a_1051_125# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND a_1201_99# a_1137_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_464_123# SCE a_319_123# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1157_449# a_1201_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_1051_125# a_823_47# a_1137_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_319_123# a_78_123# a_441_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_1459_449# a_628_123# a_1664_65# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND CLK a_628_123# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND a_628_123# a_823_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_1657_383# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_1459_449# a_823_47# a_1615_495# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VPWR a_1657_383# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VGND a_78_123# a_247_123# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_319_123# a_628_123# a_1051_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR a_1051_125# a_1201_99# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X12 a_1201_99# a_628_123# a_1459_449# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X13 a_1137_125# a_1201_99# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VGND a_1051_125# a_1201_99# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 a_464_123# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VPWR a_628_123# a_823_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X17 a_1615_495# a_1657_383# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 a_78_123# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 a_78_123# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_1051_125# a_628_123# a_1157_449# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X21 a_319_123# a_823_47# a_1051_125# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 a_247_123# D a_319_123# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_319_123# SCE a_464_123# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VPWR a_1459_449# a_1657_383# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X25 a_1201_99# a_823_47# a_1459_449# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VGND a_1459_449# a_1657_383# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X27 a_441_491# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X28 a_1664_65# a_1657_383# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 VPWR SCE a_283_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X30 a_283_491# D a_319_123# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X31 VPWR CLK a_628_123# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.cdl b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.cdl
index 6b223ff..1679aff 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.cdl
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 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.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.42 l=0.15 mult=1 sa=0.265
+MI652 M1 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
-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.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 M0 clkpos VNB 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
-MI656 net155 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 net151 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.84 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.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
-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 net206 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 net243 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.26 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=0.64 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB phighvt m=1 w=0.64 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 net155 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 net151 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.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
+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.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
+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 net206 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 net243 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.26 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=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=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 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_lp__sdfxtp_2
diff --git a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.netlist.tsv b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.netlist.tsv
index e43af07..b3915ef 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.netlist.tsv
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_lp__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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	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.42	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	net155	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net155	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net151	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.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net151	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	net206	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	net243	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.26	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	net243	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	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	net206	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	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.42	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	net155	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net155	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net151	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.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net151	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	net206	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	net243	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.26	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	net243	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	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	0.64	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	net206	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_lp__sdfxtp_2.spice b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.spice
index 8dcbf21..6c5f9e2 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.spice
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.spice
@@ -16,72 +16,38 @@
 
 
 .subckt sky130_fd_sc_lp__sdfxtp_2 CLK D SCD SCE VGND VNB VPB VPWR Q
-M1000 a_1665_381# a_1517_63# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=2.4097e+12p ps=1.846e+07u
-M1001 VPWR SCD a_414_487# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.048e+11p ps=1.92e+06u
-M1002 VPWR a_1178_399# a_1136_451# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1003 Q a_1665_381# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=1.6005e+12p ps=1.41e+07u
-M1004 a_328_119# D a_256_119# VNB nshort w=420000u l=150000u
-+  ad=3.423e+11p pd=3.31e+06u as=8.82e+10p ps=1.26e+06u
-M1005 a_414_487# a_55_119# a_328_119# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.905e+11p ps=3.21e+06u
-M1006 a_831_47# a_610_487# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1007 a_256_119# a_55_119# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 VGND SCE a_55_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1009 VGND SCD a_464_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1010 VGND a_1665_381# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_1136_451# a_610_487# a_1047_125# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1012 a_1047_125# a_610_487# a_328_119# VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1013 Q a_1665_381# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=0p ps=0u
-M1014 a_1178_399# a_1047_125# VPWR VPB phighvt w=840000u l=150000u
-+  ad=4.62e+11p pd=2.78e+06u as=0p ps=0u
-M1015 a_1178_399# a_1047_125# VGND VNB nshort w=640000u l=150000u
-+  ad=2.158e+11p pd=2.03e+06u as=0p ps=0u
-M1016 a_1623_493# a_831_47# a_1517_63# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.688e+11p ps=2.43e+06u
-M1017 a_464_119# SCE a_328_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_328_119# D a_256_487# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.7e+06u
-M1019 a_1517_63# a_610_487# a_1178_399# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND a_1178_399# a_1149_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1021 a_1047_125# a_831_47# a_328_119# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_1665_381# a_1623_493# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_610_487# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1024 VPWR a_1665_381# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1665_381# a_1517_63# VGND VNB nshort w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1026 a_1670_63# a_610_487# a_1517_63# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.583e+11p ps=2.07e+06u
-M1027 a_1149_125# a_831_47# a_1047_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VGND a_1665_381# a_1670_63# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR SCE a_55_119# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1030 a_256_487# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_610_487# CLK VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1032 a_831_47# a_610_487# VGND VNB nshort w=420000u l=150000u
-+  ad=1.428e+11p pd=1.52e+06u as=0p ps=0u
-M1033 a_1517_63# a_831_47# a_1178_399# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1178_399# a_831_47# a_1517_63# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND a_610_487# a_831_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_1149_125# a_1178_399# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_1178_399# a_610_487# a_1517_63# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X4 VPWR a_1517_63# a_1665_381# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X5 a_1517_63# a_610_487# a_1670_63# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_1047_125# a_610_487# a_1136_451# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 a_55_119# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_328_119# a_831_47# a_1047_125# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 a_1517_63# a_831_47# a_1623_493# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_1623_493# a_1665_381# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 Q a_1665_381# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_414_487# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 VGND a_55_119# a_256_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_1047_125# a_831_47# a_1149_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 Q a_1665_381# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_256_487# D a_328_119# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X17 VPWR a_610_487# a_831_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 VGND a_1517_63# a_1665_381# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 a_328_119# a_610_487# a_1047_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 VGND a_1665_381# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 a_55_119# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 a_464_119# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VGND CLK a_610_487# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_328_119# a_55_119# a_414_487# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X25 a_256_119# D a_328_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_1136_451# a_1178_399# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X27 VGND a_1047_125# a_1178_399# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X28 a_328_119# SCE a_464_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_1670_63# a_1665_381# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 VPWR a_1047_125# a_1178_399# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X31 VPWR SCE a_256_487# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X32 VPWR CLK a_610_487# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X33 VPWR a_1665_381# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.cdl b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.cdl
index 48bb671..b74a91a 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.cdl
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.cdl
@@ -16,68 +16,68 @@
 
 .SUBCKT sky130_fd_sc_lp__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.42 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.84 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.42 l=0.15 mult=1 sa=0.265
+MI652 M1 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
-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.84 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.64 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net155 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 net151 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.84 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.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
-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 net206 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 net243 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.26 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=0.64 l=0.15 mult=1 sa=0.265
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 clkpos clkneg VPB phighvt m=1 w=0.64 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.26 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 net155 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 net151 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.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
+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.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
+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 net206 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 net243 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.26 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=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=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 S1 S0 VPB pfet_01v8_hvt m=1 w=1.26 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_lp__sdfxtp_4
diff --git a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.netlist.tsv b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.netlist.tsv
index 264000f..1acd85f 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.netlist.tsv
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.netlist.tsv
@@ -1,34 +1,34 @@
 sky130_fd_sc_lp__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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	VGND	VNB	nshort	1	0.84	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.42	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	net155	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net155	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net151	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.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net151	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	net206	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	net243	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.26	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	net243	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net206	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	VGND	VNB	nfet_01v8	1	0.84	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.42	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	net155	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net155	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net151	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.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net151	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	net206	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	net243	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.26	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	net243	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	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	0.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net206	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_lp__sdfxtp_4.spice b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.spice
index 46f55f1..a735249 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.spice
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_lp__sdfxtp_4 CLK D SCD SCE VGND VNB VPB VPWR Q
-M1000 a_483_123# SCE a_359_123# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.087e+11p ps=3.15e+06u
-M1001 VPWR SCD a_454_491# VPB phighvt w=640000u l=150000u
-+  ad=2.6409e+12p pd=2.195e+07u as=2.048e+11p ps=1.92e+06u
-M1002 a_1203_99# a_1053_125# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1003 a_850_51# a_641_123# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1004 VPWR a_1673_409# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1005 VGND a_1673_409# Q VNB nshort w=840000u l=150000u
-+  ad=1.8691e+12p pd=1.667e+07u as=4.704e+11p ps=4.48e+06u
-M1006 a_850_51# a_641_123# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1007 a_454_491# a_91_123# a_359_123# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.905e+11p ps=3.21e+06u
-M1008 a_1053_125# a_850_51# a_359_123# VPB phighvt w=420000u l=150000u
-+  ad=2.149e+11p pd=1.92e+06u as=0p ps=0u
-M1009 a_1053_125# a_641_123# a_359_123# VNB nshort w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=0p ps=0u
-M1010 a_1143_125# a_850_51# a_1053_125# VNB nshort w=420000u l=150000u
-+  ad=1.26e+11p pd=1.44e+06u as=0p ps=0u
-M1011 Q a_1673_409# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 VGND a_1203_99# a_1143_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_1673_409# a_1475_449# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1014 Q a_1673_409# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1673_409# a_1475_449# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1016 a_296_491# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1017 Q a_1673_409# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR a_1673_409# a_1631_507# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1019 a_1203_99# a_1053_125# VGND VNB nshort w=640000u l=150000u
-+  ad=2.286e+11p pd=2.07e+06u as=0p ps=0u
-M1020 a_359_123# D a_296_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR a_1203_99# a_1199_449# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1022 a_1199_449# a_641_123# a_1053_125# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1475_449# a_641_123# a_1203_99# VPB phighvt w=840000u l=150000u
-+  ad=3.696e+11p pd=2.94e+06u as=0p ps=0u
-M1024 Q a_1673_409# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND a_1673_409# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VGND SCD a_483_123# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR SCE a_91_123# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1028 a_641_123# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=1.512e+11p pd=1.56e+06u as=0p ps=0u
-M1029 VGND a_1673_409# a_1670_61# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1030 a_359_123# D a_260_123# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.449e+11p ps=1.53e+06u
-M1031 a_641_123# CLK VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.696e+11p pd=1.81e+06u as=0p ps=0u
-M1032 a_1631_507# a_850_51# a_1475_449# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_1475_449# a_850_51# a_1203_99# VNB nshort w=420000u l=150000u
-+  ad=2.163e+11p pd=1.87e+06u as=0p ps=0u
-M1034 a_1670_61# a_641_123# a_1475_449# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND SCE a_91_123# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1036 VPWR a_1673_409# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_260_123# a_91_123# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_91_123# a_260_123# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_483_123# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_359_123# a_91_123# a_454_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_1143_125# a_1203_99# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_1199_449# a_1203_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 Q a_1673_409# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Q a_1673_409# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 VGND a_1475_449# a_1673_409# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND a_1673_409# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_359_123# SCE a_483_123# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_1475_449# a_641_123# a_1670_61# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_1203_99# a_850_51# a_1475_449# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND CLK a_641_123# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_359_123# a_850_51# a_1053_125# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 a_1631_507# a_1673_409# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 Q a_1673_409# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 VPWR a_1673_409# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 VPWR a_1053_125# a_1203_99# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X18 a_1053_125# a_850_51# a_1143_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VPWR a_1475_449# a_1673_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 VPWR CLK a_641_123# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X21 VPWR a_641_123# a_850_51# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 VPWR a_1673_409# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 a_454_491# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X24 a_91_123# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_1203_99# a_641_123# a_1475_449# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X26 a_1670_61# a_1673_409# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 VPWR SCE a_296_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X28 a_296_491# D a_359_123# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X29 a_91_123# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X30 a_1053_125# a_641_123# a_1199_449# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X31 a_1475_449# a_850_51# a_1631_507# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X32 a_260_123# D a_359_123# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 VGND a_1673_409# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X34 Q a_1673_409# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X35 VGND a_641_123# a_850_51# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 VGND a_1053_125# a_1203_99# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X37 a_359_123# a_641_123# a_1053_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.cdl b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.cdl
index 6e812c6..57b0fe3 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.cdl
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.cdl
@@ -16,80 +16,80 @@
 
 .SUBCKT sky130_fd_sc_lp__sdfxtp_lp 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.42 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.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.42 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.42 l=0.15 mult=1 sa=0.265
+MI652 M1 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
-MI670 net109 S1 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI669 net105 S0 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI639 sceb SCE VNB nshort m=1 w=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 net97 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
-MI667 net93 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
-MI666 net112 clkneg 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.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI665 net85 CLK VNB nshort m=1 w=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
-MI656 net77 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 net56 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.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
-MI635 clkneg CLK VNB nshort m=1 w=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
-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 net148 S1 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
-MI640 sceb SCE 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
-MI658 net181 M1 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
-MI645 Q S1 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
-MI651 db clkpos 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
-MI653 M1 clkneg 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
-MI659 M0 clkneg 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
-MI638 clkneg CLK 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
-MI637 clkpos clkneg VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265
+MI670 net109 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
-MI650 S1 S0 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI669 net105 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
+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
+MI668 net97 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
+MI667 net93 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
+MI666 net112 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
+MI665 net85 CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 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 net77 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 net56 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI644 S0 clkpos VPB phighvt m=1 w=1 l=0.25 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.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
+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 net148 S1 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
+MI640 sceb SCE 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
+MI658 net181 M1 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
+MI645 Q S1 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
-MI664 M1 M0 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI651 db clkpos 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
+MI653 M1 clkneg 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
+MI659 M0 clkneg 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
+MI638 clkneg CLK 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
+MI637 clkpos clkneg 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
+MI650 S1 S0 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
-MI107 p0 SCE VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI644 S0 clkpos 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
+MI664 M1 M0 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
-MI94 db D 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
-MI108 p1 SCD VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI107 p0 SCE 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
-MI101 db sceb VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI94 db D 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
+MI108 p1 SCD 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
+MI101 db sceb 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_lp__sdfxtp_lp
diff --git a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.netlist.tsv b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.netlist.tsv
index 4776b7b..d19ec24 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.netlist.tsv
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.netlist.tsv
@@ -1,40 +1,40 @@
 sky130_fd_sc_lp__sdfxtp_lp	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	S1	S0	net105	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI634	MOSFET	M1	M0	net97	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	net112	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net109	S1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	net105	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI639	MOSFET	sceb	SCE	net93	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI668	MOSFET	net97	M0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI667	MOSFET	net93	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	net112	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI665	MOSFET	net85	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	M0	clkpos	net77	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net77	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI641	MOSFET	net56	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	net109	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
-MI635	MOSFET	clkneg	CLK	net85	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	S0	clkneg	net56	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	net148	S1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI640	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net181	M1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI645	MOSFET	Q	S1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	db	clkpos	M0	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	M1	clkneg	S0	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	M0	clkneg	net181	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	S1	S0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI644	MOSFET	S0	clkpos	net148	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M1	M0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI107	MOSFET	p0	SCE	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI94	MOSFET	db	D	p0	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI108	MOSFET	p1	SCD	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI101	MOSFET	db	sceb	p1	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	M1	clkpos	S0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	S1	S0	net105	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI634	MOSFET	M1	M0	net97	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	net112	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net109	S1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	net105	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI639	MOSFET	sceb	SCE	net93	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI668	MOSFET	net97	M0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI667	MOSFET	net93	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	net112	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI665	MOSFET	net85	CLK	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	net77	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net77	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI641	MOSFET	net56	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	net109	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
+MI635	MOSFET	clkneg	CLK	net85	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	S0	clkneg	net56	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	net148	S1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI640	MOSFET	sceb	SCE	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net181	M1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI645	MOSFET	Q	S1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	db	clkpos	M0	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	M1	clkneg	S0	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	M0	clkneg	net181	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI638	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	S1	S0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI644	MOSFET	S0	clkpos	net148	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M1	M0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI107	MOSFET	p0	SCE	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI94	MOSFET	db	D	p0	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI108	MOSFET	p1	SCD	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI101	MOSFET	db	sceb	p1	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.spice b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.spice
index c7365ee..ab64000 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.spice
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.spice
@@ -16,80 +16,42 @@
 
 
 .subckt sky130_fd_sc_lp__sdfxtp_lp CLK D SCD SCE VGND VNB VPB VPWR Q
-M1000 a_457_417# D a_351_417# VPB phighvt w=1e+06u l=250000u
-+  ad=2.2e+11p pd=2.44e+06u as=5.65e+11p ps=5.13e+06u
-M1001 VGND a_2148_185# a_1910_155# VNB nshort w=420000u l=150000u
-+  ad=8.911e+11p pd=9.43e+06u as=2.289e+11p ps=2.77e+06u
-M1002 a_2628_69# a_2148_185# Q VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1003 a_351_417# D a_351_125# VNB nshort w=420000u l=150000u
-+  ad=2.688e+11p pd=2.96e+06u as=1.008e+11p ps=1.32e+06u
-M1004 a_978_66# a_733_66# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1005 VPWR SCE a_27_409# VPB phighvt w=1e+06u l=250000u
-+  ad=2.185e+12p pd=1.637e+07u as=2.85e+11p ps=2.57e+06u
-M1006 VPWR a_2148_185# Q VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1007 a_1528_347# a_733_66# a_1263_155# VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=2.8e+11p ps=2.56e+06u
-M1008 a_1957_347# a_733_66# a_1910_155# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1009 a_351_417# a_733_66# a_1263_155# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.31e+11p ps=1.94e+06u
-M1010 a_1576_99# a_998_347# a_1957_347# VNB nshort w=420000u l=150000u
-+  ad=3.697e+11p pd=4.11e+06u as=0p ps=0u
-M1011 a_351_417# a_27_409# a_244_417# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=5.7e+11p ps=5.14e+06u
-M1012 a_998_347# a_733_66# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1013 a_2148_185# a_1957_347# a_2359_69# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=8.82e+10p ps=1.26e+06u
-M1014 a_244_417# SCD VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND SCE a_159_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1016 a_1576_99# a_1263_155# a_1722_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1017 a_1957_347# a_733_66# a_1576_99# VPB phighvt w=1e+06u l=250000u
-+  ad=4.603e+11p pd=3.02e+06u as=4.5e+11p ps=2.9e+06u
-M1018 a_820_66# CLK a_733_66# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1019 VGND SCD a_531_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.302e+11p ps=1.46e+06u
-M1020 VGND CLK a_820_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1263_155# a_998_347# a_351_417# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 VPWR a_1576_99# a_1528_347# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1263_155# a_998_347# a_1160_155# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.73e+11p ps=2.98e+06u
-M1024 a_2359_69# a_1957_347# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_351_125# a_27_409# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR a_2148_185# a_2095_361# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.65e+11p ps=2.53e+06u
-M1027 a_998_347# a_733_66# a_978_66# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1028 a_1722_125# a_1263_155# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 VPWR CLK a_733_66# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1030 VPWR SCE a_457_417# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_2148_185# a_1957_347# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1032 a_159_125# SCE a_27_409# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1033 a_2095_361# a_998_347# a_1957_347# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_531_125# SCE a_351_417# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VGND a_2148_185# a_2628_69# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_1576_99# a_1263_155# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VGND a_1576_99# a_1160_155# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND a_733_66# a_978_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND a_1957_347# a_2359_69# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_733_66# CLK a_820_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_457_417# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_1576_99# a_733_66# a_1957_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_531_125# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND a_1263_155# a_1722_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_351_417# D a_457_417# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 a_1263_155# a_733_66# a_351_417# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR a_733_66# a_998_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 VPWR a_1263_155# a_1576_99# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 a_1160_155# a_998_347# a_1263_155# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_1957_347# a_998_347# a_1576_99# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VGND a_27_409# a_351_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 Q a_2148_185# a_2628_69# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_27_409# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X16 a_1263_155# a_733_66# a_1528_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X17 a_27_409# SCE a_159_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_351_417# SCE a_531_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_2359_69# a_1957_347# a_2148_185# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_1528_347# a_1576_99# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X21 Q a_2148_185# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X22 a_351_125# D a_351_417# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_1957_347# a_998_347# a_2095_361# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X24 VPWR SCD a_244_417# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X25 a_159_125# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_244_417# a_27_409# a_351_417# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X27 a_733_66# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X28 a_820_66# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_1910_155# a_2148_185# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_2628_69# a_2148_185# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_1910_155# a_733_66# a_1957_347# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 VPWR a_1957_347# a_2148_185# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X33 a_1160_155# a_1576_99# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_351_417# a_998_347# a_1263_155# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X35 a_1722_125# a_1263_155# a_1576_99# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 a_2095_361# a_2148_185# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X37 a_978_66# a_733_66# a_998_347# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.cdl b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.cdl
index 852cd06..cbfb08b 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.cdl
+++ b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_lp__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.64 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.64 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.26 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.64 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.64 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.64 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.64 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.26 l=0.15 mult=1 sa=0.265
+MI659 net76 CLK 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
-MI43 net116 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI658 net76 m1 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 net116 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI19 m1 M0 VPB pfet_01v8_hvt m=1 w=1.26 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.84 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net112 CLK VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net76 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 net116 GATE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI22 net63 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 clkpos CLK VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI21 net116 GATE 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=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 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 GCLK net76 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net116 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 m1 M0 VNB nfet_01v8 m=1 w=0.84 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.84 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net112 CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net76 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 net116 GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 GCLK net76 VNB nfet_01v8 m=1 w=0.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_lp__sdlclkp_1
diff --git a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.netlist.tsv b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.netlist.tsv
index b47fe19..3fe8ac2 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.netlist.tsv
+++ b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_lp__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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net76	m1	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net63	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net116	GATE	net63	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net76	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net116	clkneg	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net116	clkpos	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	VGND	VNB	nshort	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net112	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net76	m1	net112	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net116	GATE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	GCLK	net76	VGND	VNB	nshort	1	0.84	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.64	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.64	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.26	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.64	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.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	0.64	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.64	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.26	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net116	clkpos	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net112	CLK	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net76	m1	net112	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net116	GATE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	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	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	GCLK	net76	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.spice b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.spice
index 5f2b2f0..76962a5 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.spice
+++ b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_lp__sdlclkp_1 CLK GATE SCE VGND VNB VPB VPWR GCLK
-M1000 VGND a_737_329# a_721_133# VNB nshort w=420000u l=150000u
-+  ad=9.706e+11p pd=9.31e+06u as=8.82e+10p ps=1.26e+06u
-M1001 a_623_133# a_334_69# a_154_69# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.809e+11p ps=3.18e+06u
-M1002 a_1231_367# CLK VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=1.656e+12p ps=1.346e+07u
-M1003 VGND CLK a_254_357# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1004 a_334_69# a_254_357# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1005 GCLK a_1231_367# VGND VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1006 a_721_133# a_334_69# a_623_133# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.428e+11p ps=1.52e+06u
-M1007 VPWR CLK a_254_357# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1008 VPWR a_737_329# a_1231_367# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR a_737_329# a_736_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1010 GCLK a_1231_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1011 a_154_69# SCE VGND VNB nshort w=420000u l=150000u
-+  ad=2.457e+11p pd=2.85e+06u as=0p ps=0u
-M1012 a_1194_52# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1013 a_1231_367# a_737_329# a_1194_52# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1014 a_737_329# a_623_133# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1015 a_154_69# GATE a_110_468# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.7e+06u
-M1016 a_334_69# a_254_357# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1017 a_736_463# a_254_357# a_623_133# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND GATE a_154_69# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_623_133# a_254_357# a_154_69# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_110_468# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_737_329# a_623_133# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
+X0 a_1231_367# a_737_329# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_254_357# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VGND CLK a_1194_52# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_721_133# a_737_329# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_110_468# GATE a_154_69# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 VPWR a_1231_367# GCLK VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 VGND a_254_357# a_334_69# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_254_357# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 VPWR SCE a_110_468# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 a_736_463# a_737_329# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X10 a_623_133# a_334_69# a_721_133# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR a_623_133# a_737_329# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VPWR CLK a_1231_367# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 VGND a_623_133# a_737_329# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X14 VGND SCE a_154_69# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_154_69# GATE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_1194_52# a_737_329# a_1231_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_154_69# a_254_357# a_623_133# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VPWR a_254_357# a_334_69# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 a_623_133# a_254_357# a_736_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X20 VGND a_1231_367# GCLK VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 a_154_69# a_334_69# a_623_133# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_2.cdl b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_2.cdl
index f8456ea..9148f79 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_2.cdl
+++ b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_2.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_lp__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=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 net76 m1 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
-MI19 m1 M0 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI22 net68 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
-MI21 net116 GATE VPB phighvt m=1 w=0.64 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.64 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.64 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.26 l=0.15 mult=1 sa=0.265
+MI659 net76 CLK 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
-MI43 net116 clkneg VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI658 net76 m1 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 net116 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI19 m1 M0 VPB pfet_01v8_hvt m=1 w=1.26 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.84 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net112 CLK VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net76 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 net116 GATE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI22 net68 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 clkpos CLK VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI21 net116 GATE 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=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 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 GCLK net76 VPB pfet_01v8_hvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net116 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 m1 M0 VNB nfet_01v8 m=1 w=0.84 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.84 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net112 CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net76 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 net116 GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 GCLK net76 VNB nfet_01v8 m=2 w=0.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_lp__sdlclkp_2
diff --git a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_2.netlist.tsv b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_2.netlist.tsv
index 8abd0d0..259ffcf 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_2.netlist.tsv
+++ b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_2.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_lp__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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net76	m1	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net68	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net116	GATE	net68	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net76	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net116	clkneg	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net116	clkpos	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	VGND	VNB	nshort	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net112	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net76	m1	net112	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net116	GATE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	GCLK	net76	VGND	VNB	nshort	2	0.84	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.64	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.64	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net68	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net116	GATE	net68	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	0.64	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.64	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.26	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net116	clkpos	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net112	CLK	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net76	m1	net112	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net116	GATE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	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	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	GCLK	net76	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_2.spice b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_2.spice
index 822dc53..6ba5943 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_2.spice
+++ b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_2.spice
@@ -16,52 +16,28 @@
 
 
 .subckt sky130_fd_sc_lp__sdlclkp_2 CLK GATE SCE VGND VNB VPB VPWR GCLK
-M1000 VPWR a_742_107# a_1235_429# VPB phighvt w=640000u l=150000u
-+  ad=1.9983e+12p pd=1.668e+07u as=1.792e+11p ps=1.84e+06u
-M1001 VGND a_1235_429# GCLK VNB nshort w=840000u l=150000u
-+  ad=1.1701e+12p pd=1.139e+07u as=2.352e+11p ps=2.24e+06u
-M1002 a_614_133# a_282_70# a_110_70# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.809e+11p ps=3.18e+06u
-M1003 VPWR CLK a_250_443# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1004 VPWR a_1235_429# GCLK VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1005 a_110_70# SCE VGND VNB nshort w=420000u l=150000u
-+  ad=2.709e+11p pd=2.97e+06u as=0p ps=0u
-M1006 a_1174_74# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1007 a_282_70# a_250_443# VPWR VPB phighvt w=640000u l=150000u
-+  ad=3.136e+11p pd=2.26e+06u as=0p ps=0u
-M1008 a_1235_429# a_742_107# a_1174_74# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1009 GCLK a_1235_429# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND GATE a_110_70# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VPWR a_742_107# a_746_457# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1012 GCLK a_1235_429# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_742_107# a_700_133# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1014 a_614_133# a_250_443# a_110_70# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1015 a_700_133# a_282_70# a_614_133# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_742_107# a_614_133# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1017 a_110_70# GATE a_110_468# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.7e+06u
-M1018 a_746_457# a_250_443# a_614_133# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_742_107# a_614_133# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1020 a_282_70# a_250_443# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1021 a_110_468# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1235_429# CLK VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND CLK a_250_443# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
+X0 a_110_70# a_250_443# a_614_133# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VGND SCE a_110_70# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_700_133# a_742_107# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_614_133# a_250_443# a_746_457# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_110_468# GATE a_110_70# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_110_70# a_282_70# a_614_133# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_614_133# a_282_70# a_700_133# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND a_614_133# a_742_107# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VPWR a_614_133# a_742_107# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 GCLK a_1235_429# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 VPWR a_1235_429# GCLK VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VPWR SCE a_110_468# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 a_1174_74# a_742_107# a_1235_429# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_1235_429# a_742_107# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 a_110_70# GATE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VGND a_1235_429# GCLK VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_250_443# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X17 VGND a_250_443# a_282_70# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_746_457# a_742_107# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 VPWR a_250_443# a_282_70# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 a_250_443# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 VPWR CLK a_1235_429# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 VGND CLK a_1174_74# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 GCLK a_1235_429# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.cdl b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.cdl
index 72669a1..c62f8b6 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.cdl
+++ b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 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.26 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.26 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.64 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.64 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.64 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.64 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.26 l=0.15 mult=1 sa=0.265
+MI659 net76 CLK VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265
+MI658 net76 m1 VPB pfet_01v8_hvt m=1 w=1.26 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.42 l=0.15 mult=1 sa=0.265
+MI19 m1 M0 VPB pfet_01v8_hvt m=1 w=1.26 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.84 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net112 CLK VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net76 m1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 net116 GATE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI22 net63 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 clkpos CLK VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI21 net116 GATE 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=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 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 GCLK net76 VPB pfet_01v8_hvt m=4 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI43 net116 clkneg VPB pfet_01v8_hvt m=1 w=0.42 l=0.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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI20 m1 M0 VNB nfet_01v8 m=1 w=0.84 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.84 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net112 CLK VNB nfet_01v8 m=1 w=0.84 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.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 net116 GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 GCLK net76 VNB nfet_01v8 m=4 w=0.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_lp__sdlclkp_4
diff --git a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.netlist.tsv b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.netlist.tsv
index 3455458..139ea27 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.netlist.tsv
+++ b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_lp__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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net76	m1	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net63	SCE	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net116	GATE	net63	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	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net76	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net116	clkneg	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net116	clkpos	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	VGND	VNB	nshort	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net112	CLK	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net76	m1	net112	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net116	GATE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	GCLK	net76	VGND	VNB	nshort	4	0.84	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.26	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.26	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.26	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.64	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.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	0.64	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.64	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.26	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net116	clkpos	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	VGND	VNB	nfet_01v8	1	0.84	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net112	CLK	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net76	m1	net112	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net116	GATE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	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	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	GCLK	net76	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.spice b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.spice
index f73338f..89d0f38 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.spice
+++ b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_lp__sdlclkp_4 CLK GATE SCE VGND VNB VPB VPWR GCLK
-M1000 VPWR a_762_107# a_720_463# VPB phighvt w=420000u l=150000u
-+  ad=2.5484e+12p pd=2.049e+07u as=8.82e+10p ps=1.26e+06u
-M1001 GCLK a_1275_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1002 a_1216_47# CLK VGND VNB nshort w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=1.6132e+12p ps=1.495e+07u
-M1003 a_1275_367# a_762_107# a_1216_47# VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1004 a_762_107# a_634_133# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1005 a_762_107# a_634_133# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.339e+11p pd=3.05e+06u as=0p ps=0u
-M1006 GCLK a_1275_367# VGND VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=0p ps=0u
-M1007 VPWR a_762_107# a_1275_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.528e+11p ps=3.08e+06u
-M1008 VPWR a_1275_367# GCLK VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND a_762_107# a_720_133# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1010 GCLK a_1275_367# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_634_133# a_252_361# a_134_70# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.436e+11p ps=2.84e+06u
-M1012 VGND GATE a_134_70# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_1275_367# GCLK VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_134_70# SCE VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_335_70# a_252_361# VPWR VPB phighvt w=640000u l=150000u
-+  ad=2.112e+11p pd=1.94e+06u as=0p ps=0u
-M1016 a_720_133# a_335_70# a_634_133# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND CLK a_252_361# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1018 a_1275_367# CLK VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_134_70# GATE a_110_468# VPB phighvt w=640000u l=150000u
-+  ad=2.809e+11p pd=3.18e+06u as=1.344e+11p ps=1.7e+06u
-M1020 a_634_133# a_335_70# a_134_70# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1021 VGND a_1275_367# GCLK VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_110_468# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 GCLK a_1275_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_1275_367# GCLK VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_720_463# a_252_361# a_634_133# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR CLK a_252_361# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1027 a_335_70# a_252_361# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 a_1275_367# a_762_107# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VGND a_1275_367# GCLK VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR a_1275_367# GCLK VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_110_468# GATE a_134_70# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 VPWR a_252_361# a_335_70# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_634_133# a_252_361# a_720_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_720_463# a_762_107# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND SCE a_134_70# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_252_361# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 GCLK a_1275_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VPWR SCE a_110_468# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X11 a_1216_47# a_762_107# a_1275_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 VGND a_252_361# a_335_70# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_720_133# a_762_107# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VGND a_1275_367# GCLK VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_252_361# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_134_70# a_335_70# a_634_133# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X17 a_634_133# a_335_70# a_720_133# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VPWR a_1275_367# GCLK VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 GCLK a_1275_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 GCLK a_1275_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 VGND CLK a_1216_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 a_134_70# GATE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VPWR a_634_133# a_762_107# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 a_134_70# a_252_361# a_634_133# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 VGND a_634_133# a_762_107# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X26 VPWR CLK a_1275_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 GCLK a_1275_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.cdl b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.cdl
index 5f30b9f..46893f3 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.cdl
+++ b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.cdl
@@ -16,60 +16,60 @@
 
 .SUBCKT sky130_fd_sc_lp__sdlclkp_lp 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=1 l=0.25 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=1 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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=1 l=0.25 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI21 net136 GATE 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
-MI47 clkneg clkpos 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
-MI45 clkpos CLK 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
-MI660 GCLK net76 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
-MI43 net136 clkneg 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
-MI42 net136 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI662 net88 m1 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
-MI20 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
-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 net147 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
-MI28 net135 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
-MI24 net136 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
-MI657 net132 CLK VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI656 net76 m1 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI23 net136 GATE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI46 clkneg clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI664 M0 clkpos 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
-MI44 clkpos CLK VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI653 GCLK net76 VNB nshort m=1 w=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 net111 net76 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI659 net76 CLK 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
-MI30 net151 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
-MI29 net100 GATE VNB nshort m=1 w=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 net119 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI658 net76 m1 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
-MI26 net115 CLK VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI19 m1 M0 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
+MI22 net63 SCE 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
+MI21 net136 GATE 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
+MI47 clkneg clkpos 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
+MI45 clkpos CLK 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
+MI660 GCLK net76 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
+MI43 net136 clkneg 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
+MI42 net136 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
+MI20 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
+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 net147 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
+MI28 net135 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
+MI24 net136 SCE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net132 CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI656 net76 m1 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI23 net136 GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI46 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI44 clkpos CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI653 GCLK net76 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI31 net111 net76 VNB nfet_01v8 m=1 w=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 net151 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
+MI29 net100 GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI27 net119 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
+MI26 net115 CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__sdlclkp_lp
diff --git a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.netlist.tsv b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.netlist.tsv
index a2ed9ba..ee2c627 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.netlist.tsv
+++ b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.netlist.tsv
@@ -1,30 +1,30 @@
 sky130_fd_sc_lp__sdlclkp_lp	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	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	M0	clkpos	net88	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	net76	CLK	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net76	m1	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	m1	M0	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI22	MOSFET	net63	SCE	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI21	MOSFET	net136	GATE	net63	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	clkpos	CLK	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	GCLK	net76	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net136	clkneg	M0	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net136	clkpos	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	m1	M0	net151	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	M0	clkneg	net147	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net147	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI28	MOSFET	net135	SCE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	net136	SCE	net135	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net132	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net76	m1	net132	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	net136	GATE	net100	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	clkneg	clkpos	net119	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	clkpos	CLK	net115	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	GCLK	net76	net111	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	net111	net76	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net151	M0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	net100	GATE	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net119	clkpos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	net115	CLK	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net88	m1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	M0	clkpos	net88	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	net76	CLK	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net76	m1	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	m1	M0	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI22	MOSFET	net63	SCE	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI21	MOSFET	net136	GATE	net63	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	clkneg	clkpos	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	clkpos	CLK	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	GCLK	net76	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net136	clkneg	M0	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net136	clkpos	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	m1	M0	net151	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	M0	clkneg	net147	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net147	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI28	MOSFET	net135	SCE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	net136	SCE	net135	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net132	CLK	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net76	m1	net132	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	net136	GATE	net100	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	clkneg	clkpos	net119	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	clkpos	CLK	net115	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	GCLK	net76	net111	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	net111	net76	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net151	M0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	net100	GATE	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net119	clkpos	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	net115	CLK	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/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.spice b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.spice
index 3bb50bc..ba5faac 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.spice
+++ b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.spice
@@ -16,60 +16,32 @@
 
 
 .subckt sky130_fd_sc_lp__sdlclkp_lp CLK GATE SCE VGND VNB VPB VPWR GCLK
-M1000 VPWR SCE a_200_376# VPB phighvt w=1e+06u l=250000u
-+  ad=1.64165e+12p pd=1.183e+07u as=2.4e+11p ps=2.48e+06u
-M1001 a_1384_416# a_860_21# a_1392_192# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.008e+11p ps=1.32e+06u
-M1002 a_698_405# a_447_376# a_93_376# VPB phighvt w=1e+06u l=250000u
-+  ad=2.8e+11p pd=2.56e+06u as=5.7e+11p ps=5.14e+06u
-M1003 a_860_21# a_698_405# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1004 a_860_21# a_698_405# a_1016_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.008e+11p ps=1.32e+06u
-M1005 GCLK a_1384_416# a_1548_48# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1006 a_447_376# a_356_278# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=3.9545e+11p pd=2.94e+06u as=0p ps=0u
-M1007 VPWR CLK a_356_278# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1008 VPWR a_860_21# a_804_405# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1009 a_447_376# a_356_278# a_436_101# VNB nshort w=420000u l=150000u
-+  ad=1.533e+11p pd=1.57e+06u as=8.82e+10p ps=1.26e+06u
-M1010 VPWR a_860_21# a_1384_416# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1011 a_114_101# GATE VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=6.846e+11p ps=7.46e+06u
-M1012 VGND CLK a_1234_192# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1013 a_698_405# a_356_278# a_93_376# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.373e+11p ps=2.81e+06u
-M1014 a_1016_47# a_698_405# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_436_101# a_356_278# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_1392_192# CLK VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1234_192# CLK a_356_278# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1018 a_200_376# GATE a_93_376# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_278_101# SCE a_93_376# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1020 a_1548_48# a_1384_416# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_804_405# a_356_278# a_698_405# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 GCLK a_1384_416# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1023 VGND SCE a_278_101# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VGND a_860_21# a_812_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1025 a_1384_416# CLK VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_812_47# a_447_376# a_698_405# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_93_376# GATE a_114_101# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR a_1384_416# GCLK VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_114_101# GATE a_93_376# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_93_376# GATE a_200_376# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 a_1016_47# a_698_405# a_860_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_804_405# a_860_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_1384_416# a_860_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_278_101# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_436_101# a_356_278# a_447_376# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR a_698_405# a_860_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 VGND CLK a_1392_192# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_698_405# a_356_278# a_804_405# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 VPWR CLK a_1384_416# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 a_812_47# a_860_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_93_376# a_447_376# a_698_405# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X14 a_356_278# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X15 a_1392_192# a_860_21# a_1384_416# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_1548_48# a_1384_416# GCLK VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_356_278# CLK a_1234_192# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_93_376# a_356_278# a_698_405# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 VGND GATE a_114_101# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_698_405# a_447_376# a_812_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 VGND a_1384_416# a_1548_48# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_93_376# SCE a_278_101# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VGND a_356_278# a_436_101# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VGND a_698_405# a_1016_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_200_376# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X26 VPWR a_356_278# a_447_376# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X27 a_1234_192# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.cdl b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.cdl
index befdca6..625a2a0 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.cdl
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__sleep_pargate_plv_14 VIRTPWR VPWR SLEEP VPB
 *.PININFO VIRTPWR:? VPWR:? SLEEP:? VPB:?
-M1000 VIRTPWR SLEEP VPB phighvt w=7e+06u l=150000u ad=3.71e+12p
+M1000 VIRTPWR SLEEP VPB pfet_01v8_hvt w=7e+06u l=150000u ad=3.71e+12p
 + pd=2.906e+07u as=1.96e+12p ps=1.456e+07u
-M1001 VPWR SLEEP VPB phighvt w=7e+06u l=150000u ad=0p pd=0u as=0p
-+ ps=0u
+M1001 VPWR SLEEP VPB pfet_01v8_hvt w=7e+06u l=150000u ad=0p pd=0u
++ as=0p ps=0u
 .ENDS sky130_fd_sc_lp__sleep_pargate_plv_14
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.netlist.tsv b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.netlist.tsv
index cd0f9e4..f390fa4 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.netlist.tsv
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__sleep_pargate_plv_14	VIRTPWR:? VPWR:? SLEEP:? VPB:?
 Name	Formula	nd	ng	ns	nb	mname	w	l	ad	pd	as	ps
-M1000	MOSFET	VIRTPWR	SLEEP	VPWR	VPB	phighvt	7e+06u	150000u	3.71e+12p	2.906e+07u	1.96e+12p	1.456e+07u
-M1001	MOSFET	VPWR	SLEEP	VIRTPWR	VPB	phighvt	7e+06u	150000u	0p	0u	0p	0u
+M1000	MOSFET	VIRTPWR	SLEEP	VPWR	VPB	pfet_01v8_hvt	7e+06u	150000u	3.71e+12p	2.906e+07u	1.96e+12p	1.456e+07u
+M1001	MOSFET	VPWR	SLEEP	VIRTPWR	VPB	pfet_01v8_hvt	7e+06u	150000u	0p	0u	0p	0u
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.spice b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.spice
index fc83937..8296ed8 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.spice
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_lp__sleep_pargate_plv_14 VIRTPWR VPWR SLEEP VPB
-M1000 VIRTPWR SLEEP VPWR VPB phighvt w=7e+06u l=150000u
-+  ad=3.71e+12p pd=2.906e+07u as=1.96e+12p ps=1.456e+07u
-M1001 VPWR SLEEP VIRTPWR VPB phighvt w=7e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VIRTPWR SLEEP VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=7e+06u l=150000u
+X1 VPWR SLEEP VIRTPWR VPB sky130_fd_pr__pfet_01v8_hvt w=7e+06u l=150000u
 .ends
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.cdl b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.cdl
index 61854ff..0556282 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.cdl
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.cdl
@@ -16,10 +16,10 @@
 
 .SUBCKT sky130_fd_sc_lp__sleep_pargate_plv_21 VIRTPWR VPWR SLEEP VPB
 *.PININFO VIRTPWR:? VPWR:? SLEEP:? VPB:?
-M1000 VIRTPWR SLEEP VPB phighvt w=7e+06u l=150000u ad=3.815e+12p
+M1000 VIRTPWR SLEEP VPB pfet_01v8_hvt w=7e+06u l=150000u ad=3.815e+12p
 + pd=2.909e+07u as=3.815e+12p ps=2.909e+07u
-M1001 VIRTPWR SLEEP VPB phighvt w=7e+06u l=150000u ad=0p pd=0u as=0p
-+ ps=0u
-M1002 VPWR SLEEP VPB phighvt w=7e+06u l=150000u ad=0p pd=0u as=0p
-+ ps=0u
+M1001 VIRTPWR SLEEP VPB pfet_01v8_hvt w=7e+06u l=150000u ad=0p pd=0u
++ as=0p ps=0u
+M1002 VPWR SLEEP VPB pfet_01v8_hvt w=7e+06u l=150000u ad=0p pd=0u
++ as=0p ps=0u
 .ENDS sky130_fd_sc_lp__sleep_pargate_plv_21
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.netlist.tsv b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.netlist.tsv
index 8b023a5..98013ca 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.netlist.tsv
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.netlist.tsv
@@ -1,5 +1,5 @@
 sky130_fd_sc_lp__sleep_pargate_plv_21	VIRTPWR:? VPWR:? SLEEP:? VPB:?
 Name	Formula	nd	ng	ns	nb	mname	w	l	ad	pd	as	ps
-M1000	MOSFET	VIRTPWR	SLEEP	VPWR	VPB	phighvt	7e+06u	150000u	3.815e+12p	2.909e+07u	3.815e+12p	2.909e+07u
-M1001	MOSFET	VIRTPWR	SLEEP	VPWR	VPB	phighvt	7e+06u	150000u	0p	0u	0p	0u
-M1002	MOSFET	VPWR	SLEEP	VIRTPWR	VPB	phighvt	7e+06u	150000u	0p	0u	0p	0u
+M1000	MOSFET	VIRTPWR	SLEEP	VPWR	VPB	pfet_01v8_hvt	7e+06u	150000u	3.815e+12p	2.909e+07u	3.815e+12p	2.909e+07u
+M1001	MOSFET	VIRTPWR	SLEEP	VPWR	VPB	pfet_01v8_hvt	7e+06u	150000u	0p	0u	0p	0u
+M1002	MOSFET	VPWR	SLEEP	VIRTPWR	VPB	pfet_01v8_hvt	7e+06u	150000u	0p	0u	0p	0u
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.spice b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.spice
index 46b7290..4133877 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.spice
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.spice
@@ -16,10 +16,7 @@
 
 
 .subckt sky130_fd_sc_lp__sleep_pargate_plv_21 VIRTPWR VPWR SLEEP VPB
-M1000 VIRTPWR SLEEP VPWR VPB phighvt w=7e+06u l=150000u
-+  ad=3.815e+12p pd=2.909e+07u as=3.815e+12p ps=2.909e+07u
-M1001 VIRTPWR SLEEP VPWR VPB phighvt w=7e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR SLEEP VIRTPWR VPB phighvt w=7e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VIRTPWR SLEEP VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=7e+06u l=150000u
+X1 VPWR SLEEP VIRTPWR VPB sky130_fd_pr__pfet_01v8_hvt w=7e+06u l=150000u
+X2 VPWR SLEEP VIRTPWR VPB sky130_fd_pr__pfet_01v8_hvt w=7e+06u l=150000u
 .ends
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.cdl b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.cdl
index e045560..cb92467 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.cdl
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__sleep_pargate_plv_28 VIRTPWR VPWR SLEEP VPB
 *.PININFO VIRTPWR:? VPWR:? SLEEP:? VPB:?
-M1000 VIRTPWR SLEEP VPB phighvt w=7e+06u l=150000u ad=5.95e+12p
+M1000 VIRTPWR SLEEP VPB pfet_01v8_hvt w=7e+06u l=150000u ad=5.95e+12p
 + pd=4.37e+07u as=3.92e+12p ps=2.912e+07u
-M1001 VPWR SLEEP VPB phighvt w=7e+06u l=150000u ad=0p pd=0u as=0p
-+ ps=0u
-M1002 VIRTPWR SLEEP VPB phighvt w=7e+06u l=150000u ad=0p pd=0u as=0p
-+ ps=0u
-M1003 VPWR SLEEP VPB phighvt w=7e+06u l=150000u ad=0p pd=0u as=0p
-+ ps=0u
+M1001 VPWR SLEEP VPB pfet_01v8_hvt w=7e+06u l=150000u ad=0p pd=0u
++ as=0p ps=0u
+M1002 VIRTPWR SLEEP VPB pfet_01v8_hvt w=7e+06u l=150000u ad=0p pd=0u
++ as=0p ps=0u
+M1003 VPWR SLEEP VPB pfet_01v8_hvt w=7e+06u l=150000u ad=0p pd=0u
++ as=0p ps=0u
 .ENDS sky130_fd_sc_lp__sleep_pargate_plv_28
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.netlist.tsv b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.netlist.tsv
index 5c309c7..82c0e30 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.netlist.tsv
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__sleep_pargate_plv_28	VIRTPWR:? VPWR:? SLEEP:? VPB:?
 Name	Formula	nd	ng	ns	nb	mname	w	l	ad	pd	as	ps
-M1000	MOSFET	VIRTPWR	SLEEP	VPWR	VPB	phighvt	7e+06u	150000u	5.95e+12p	4.37e+07u	3.92e+12p	2.912e+07u
-M1001	MOSFET	VPWR	SLEEP	VIRTPWR	VPB	phighvt	7e+06u	150000u	0p	0u	0p	0u
-M1002	MOSFET	VIRTPWR	SLEEP	VPWR	VPB	phighvt	7e+06u	150000u	0p	0u	0p	0u
-M1003	MOSFET	VPWR	SLEEP	VIRTPWR	VPB	phighvt	7e+06u	150000u	0p	0u	0p	0u
+M1000	MOSFET	VIRTPWR	SLEEP	VPWR	VPB	pfet_01v8_hvt	7e+06u	150000u	5.95e+12p	4.37e+07u	3.92e+12p	2.912e+07u
+M1001	MOSFET	VPWR	SLEEP	VIRTPWR	VPB	pfet_01v8_hvt	7e+06u	150000u	0p	0u	0p	0u
+M1002	MOSFET	VIRTPWR	SLEEP	VPWR	VPB	pfet_01v8_hvt	7e+06u	150000u	0p	0u	0p	0u
+M1003	MOSFET	VPWR	SLEEP	VIRTPWR	VPB	pfet_01v8_hvt	7e+06u	150000u	0p	0u	0p	0u
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.spice b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.spice
index 16fb122..60c9536 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.spice
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__sleep_pargate_plv_28 VIRTPWR VPWR SLEEP VPB
-M1000 VIRTPWR SLEEP VPWR VPB phighvt w=7e+06u l=150000u
-+  ad=5.95e+12p pd=4.37e+07u as=3.92e+12p ps=2.912e+07u
-M1001 VPWR SLEEP VIRTPWR VPB phighvt w=7e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VIRTPWR SLEEP VPWR VPB phighvt w=7e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR SLEEP VIRTPWR VPB phighvt w=7e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VIRTPWR SLEEP VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=7e+06u l=150000u
+X1 VIRTPWR SLEEP VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=7e+06u l=150000u
+X2 VPWR SLEEP VIRTPWR VPB sky130_fd_pr__pfet_01v8_hvt w=7e+06u l=150000u
+X3 VPWR SLEEP VIRTPWR VPB sky130_fd_pr__pfet_01v8_hvt w=7e+06u l=150000u
 .ends
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.cdl b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.cdl
index 9669bf5..65fd763 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.cdl
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.cdl
@@ -16,6 +16,6 @@
 
 .SUBCKT sky130_fd_sc_lp__sleep_pargate_plv_7 VIRTPWR VPWR SLEEP VPB
 *.PININFO VIRTPWR:? VPWR:? SLEEP:? VPB:?
-M1000 VIRTPWR SLEEP VPB phighvt w=7e+06u l=150000u ad=1.855e+12p
+M1000 VIRTPWR SLEEP VPB pfet_01v8_hvt w=7e+06u l=150000u ad=1.855e+12p
 + pd=1.453e+07u as=1.855e+12p ps=1.453e+07u
 .ENDS sky130_fd_sc_lp__sleep_pargate_plv_7
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.netlist.tsv b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.netlist.tsv
index 89eb15a..1f10c31 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.netlist.tsv
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.netlist.tsv
@@ -1,3 +1,3 @@
 sky130_fd_sc_lp__sleep_pargate_plv_7	VIRTPWR:? VPWR:? SLEEP:? VPB:?
 Name	Formula	nd	ng	ns	nb	mname	w	l	ad	pd	as	ps
-M1000	MOSFET	VIRTPWR	SLEEP	VPWR	VPB	phighvt	7e+06u	150000u	1.855e+12p	1.453e+07u	1.855e+12p	1.453e+07u
+M1000	MOSFET	VIRTPWR	SLEEP	VPWR	VPB	pfet_01v8_hvt	7e+06u	150000u	1.855e+12p	1.453e+07u	1.855e+12p	1.453e+07u
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.spice b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.spice
index fee4198..ac48686 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.spice
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.spice
@@ -16,6 +16,5 @@
 
 
 .subckt sky130_fd_sc_lp__sleep_pargate_plv_7 VIRTPWR VPWR SLEEP VPB
-M1000 VIRTPWR SLEEP VPWR VPB phighvt w=7e+06u l=150000u
-+  ad=1.855e+12p pd=1.453e+07u as=1.855e+12p ps=1.453e+07u
+X0 VPWR SLEEP VIRTPWR VPB sky130_fd_pr__pfet_01v8_hvt w=7e+06u l=150000u
 .ends
diff --git a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.cdl b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.cdl
index 9fe267e..0204db8 100644
--- a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.cdl
+++ b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.cdl
@@ -16,8 +16,8 @@
 
 .SUBCKT sky130_fd_sc_lp__sleep_sergate_plv_14 VIRTPWR VPWR SLEEP VPB
 *.PININFO VIRTPWR:? VPWR:? SLEEP:? VPB:?
-M1000 VIRTPWR SLEEP VPB phighvt w=7e+06u l=150000u ad=3.71e+12p
+M1000 VIRTPWR SLEEP VPB pfet_01v8_hvt w=7e+06u l=150000u ad=3.71e+12p
 + pd=2.906e+07u as=1.96e+12p ps=1.456e+07u
-M1001 VPWR SLEEP VPB phighvt w=7e+06u l=150000u ad=0p pd=0u as=0p
-+ ps=0u
+M1001 VPWR SLEEP VPB pfet_01v8_hvt w=7e+06u l=150000u ad=0p pd=0u
++ as=0p ps=0u
 .ENDS sky130_fd_sc_lp__sleep_sergate_plv_14
diff --git a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.netlist.tsv b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.netlist.tsv
index dd289f3..9185ab9 100644
--- a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.netlist.tsv
+++ b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.netlist.tsv
@@ -1,4 +1,4 @@
 sky130_fd_sc_lp__sleep_sergate_plv_14	VIRTPWR:? VPWR:? SLEEP:? VPB:?
 Name	Formula	nd	ng	ns	nb	mname	w	l	ad	pd	as	ps
-M1000	MOSFET	VIRTPWR	SLEEP	VPWR	VPB	phighvt	7e+06u	150000u	3.71e+12p	2.906e+07u	1.96e+12p	1.456e+07u
-M1001	MOSFET	VPWR	SLEEP	VIRTPWR	VPB	phighvt	7e+06u	150000u	0p	0u	0p	0u
+M1000	MOSFET	VIRTPWR	SLEEP	VPWR	VPB	pfet_01v8_hvt	7e+06u	150000u	3.71e+12p	2.906e+07u	1.96e+12p	1.456e+07u
+M1001	MOSFET	VPWR	SLEEP	VIRTPWR	VPB	pfet_01v8_hvt	7e+06u	150000u	0p	0u	0p	0u
diff --git a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.spice b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.spice
index bb02100..e2d26e6 100644
--- a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.spice
+++ b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.spice
@@ -16,8 +16,6 @@
 
 
 .subckt sky130_fd_sc_lp__sleep_sergate_plv_14 VIRTPWR VPWR SLEEP VPB
-M1000 VIRTPWR SLEEP VPWR VPB phighvt w=7e+06u l=150000u
-+  ad=3.71e+12p pd=2.906e+07u as=1.96e+12p ps=1.456e+07u
-M1001 VPWR SLEEP VIRTPWR VPB phighvt w=7e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VIRTPWR SLEEP VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=7e+06u l=150000u
+X1 VPWR SLEEP VIRTPWR VPB sky130_fd_pr__pfet_01v8_hvt w=7e+06u l=150000u
 .ends
diff --git a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.cdl b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.cdl
index 1fd1fc0..f5bdb79 100644
--- a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.cdl
+++ b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.cdl
@@ -16,10 +16,10 @@
 
 .SUBCKT sky130_fd_sc_lp__sleep_sergate_plv_21 VIRTPWR VPWR SLEEP VPB
 *.PININFO VIRTPWR:? VPWR:? SLEEP:? VPB:?
-M1000 VIRTPWR SLEEP VPB phighvt w=7e+06u l=150000u ad=3.815e+12p
+M1000 VIRTPWR SLEEP VPB pfet_01v8_hvt w=7e+06u l=150000u ad=3.815e+12p
 + pd=2.909e+07u as=3.815e+12p ps=2.909e+07u
-M1001 VIRTPWR SLEEP VPB phighvt w=7e+06u l=150000u ad=0p pd=0u as=0p
-+ ps=0u
-M1002 VPWR SLEEP VPB phighvt w=7e+06u l=150000u ad=0p pd=0u as=0p
-+ ps=0u
+M1001 VIRTPWR SLEEP VPB pfet_01v8_hvt w=7e+06u l=150000u ad=0p pd=0u
++ as=0p ps=0u
+M1002 VPWR SLEEP VPB pfet_01v8_hvt w=7e+06u l=150000u ad=0p pd=0u
++ as=0p ps=0u
 .ENDS sky130_fd_sc_lp__sleep_sergate_plv_21
diff --git a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.netlist.tsv b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.netlist.tsv
index ed2009e..9656f89 100644
--- a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.netlist.tsv
+++ b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.netlist.tsv
@@ -1,5 +1,5 @@
 sky130_fd_sc_lp__sleep_sergate_plv_21	VIRTPWR:? VPWR:? SLEEP:? VPB:?
 Name	Formula	nd	ng	ns	nb	mname	w	l	ad	pd	as	ps
-M1000	MOSFET	VIRTPWR	SLEEP	VPWR	VPB	phighvt	7e+06u	150000u	3.815e+12p	2.909e+07u	3.815e+12p	2.909e+07u
-M1001	MOSFET	VIRTPWR	SLEEP	VPWR	VPB	phighvt	7e+06u	150000u	0p	0u	0p	0u
-M1002	MOSFET	VPWR	SLEEP	VIRTPWR	VPB	phighvt	7e+06u	150000u	0p	0u	0p	0u
+M1000	MOSFET	VIRTPWR	SLEEP	VPWR	VPB	pfet_01v8_hvt	7e+06u	150000u	3.815e+12p	2.909e+07u	3.815e+12p	2.909e+07u
+M1001	MOSFET	VIRTPWR	SLEEP	VPWR	VPB	pfet_01v8_hvt	7e+06u	150000u	0p	0u	0p	0u
+M1002	MOSFET	VPWR	SLEEP	VIRTPWR	VPB	pfet_01v8_hvt	7e+06u	150000u	0p	0u	0p	0u
diff --git a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.spice b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.spice
index d1a645a..8fd6566 100644
--- a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.spice
+++ b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.spice
@@ -16,10 +16,7 @@
 
 
 .subckt sky130_fd_sc_lp__sleep_sergate_plv_21 VIRTPWR VPWR SLEEP VPB
-M1000 VIRTPWR SLEEP VPWR VPB phighvt w=7e+06u l=150000u
-+  ad=3.815e+12p pd=2.909e+07u as=3.815e+12p ps=2.909e+07u
-M1001 VIRTPWR SLEEP VPWR VPB phighvt w=7e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VPWR SLEEP VIRTPWR VPB phighvt w=7e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VIRTPWR SLEEP VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=7e+06u l=150000u
+X1 VPWR SLEEP VIRTPWR VPB sky130_fd_pr__pfet_01v8_hvt w=7e+06u l=150000u
+X2 VPWR SLEEP VIRTPWR VPB sky130_fd_pr__pfet_01v8_hvt w=7e+06u l=150000u
 .ends
diff --git a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.cdl b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.cdl
index 5027f88..2685b32 100644
--- a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.cdl
+++ b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.cdl
@@ -16,12 +16,12 @@
 
 .SUBCKT sky130_fd_sc_lp__sleep_sergate_plv_28 VIRTPWR VPWR SLEEP VPB
 *.PININFO VIRTPWR:? VPWR:? SLEEP:? VPB:?
-M1000 VIRTPWR SLEEP VPB phighvt w=7e+06u l=150000u ad=5.95e+12p
+M1000 VIRTPWR SLEEP VPB pfet_01v8_hvt w=7e+06u l=150000u ad=5.95e+12p
 + pd=4.37e+07u as=3.92e+12p ps=2.912e+07u
-M1001 VPWR SLEEP VPB phighvt w=7e+06u l=150000u ad=0p pd=0u as=0p
-+ ps=0u
-M1002 VIRTPWR SLEEP VPB phighvt w=7e+06u l=150000u ad=0p pd=0u as=0p
-+ ps=0u
-M1003 VPWR SLEEP VPB phighvt w=7e+06u l=150000u ad=0p pd=0u as=0p
-+ ps=0u
+M1001 VPWR SLEEP VPB pfet_01v8_hvt w=7e+06u l=150000u ad=0p pd=0u
++ as=0p ps=0u
+M1002 VIRTPWR SLEEP VPB pfet_01v8_hvt w=7e+06u l=150000u ad=0p pd=0u
++ as=0p ps=0u
+M1003 VPWR SLEEP VPB pfet_01v8_hvt w=7e+06u l=150000u ad=0p pd=0u
++ as=0p ps=0u
 .ENDS sky130_fd_sc_lp__sleep_sergate_plv_28
diff --git a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.netlist.tsv b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.netlist.tsv
index 08896b3..0f75a53 100644
--- a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.netlist.tsv
+++ b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.netlist.tsv
@@ -1,6 +1,6 @@
 sky130_fd_sc_lp__sleep_sergate_plv_28	VIRTPWR:? VPWR:? SLEEP:? VPB:?
 Name	Formula	nd	ng	ns	nb	mname	w	l	ad	pd	as	ps
-M1000	MOSFET	VIRTPWR	SLEEP	VPWR	VPB	phighvt	7e+06u	150000u	5.95e+12p	4.37e+07u	3.92e+12p	2.912e+07u
-M1001	MOSFET	VPWR	SLEEP	VIRTPWR	VPB	phighvt	7e+06u	150000u	0p	0u	0p	0u
-M1002	MOSFET	VIRTPWR	SLEEP	VPWR	VPB	phighvt	7e+06u	150000u	0p	0u	0p	0u
-M1003	MOSFET	VPWR	SLEEP	VIRTPWR	VPB	phighvt	7e+06u	150000u	0p	0u	0p	0u
+M1000	MOSFET	VIRTPWR	SLEEP	VPWR	VPB	pfet_01v8_hvt	7e+06u	150000u	5.95e+12p	4.37e+07u	3.92e+12p	2.912e+07u
+M1001	MOSFET	VPWR	SLEEP	VIRTPWR	VPB	pfet_01v8_hvt	7e+06u	150000u	0p	0u	0p	0u
+M1002	MOSFET	VIRTPWR	SLEEP	VPWR	VPB	pfet_01v8_hvt	7e+06u	150000u	0p	0u	0p	0u
+M1003	MOSFET	VPWR	SLEEP	VIRTPWR	VPB	pfet_01v8_hvt	7e+06u	150000u	0p	0u	0p	0u
diff --git a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.spice b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.spice
index 38e7842..9a9d5f8 100644
--- a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.spice
+++ b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.spice
@@ -16,12 +16,8 @@
 
 
 .subckt sky130_fd_sc_lp__sleep_sergate_plv_28 VIRTPWR VPWR SLEEP VPB
-M1000 VIRTPWR SLEEP VPWR VPB phighvt w=7e+06u l=150000u
-+  ad=5.95e+12p pd=4.37e+07u as=3.92e+12p ps=2.912e+07u
-M1001 VPWR SLEEP VIRTPWR VPB phighvt w=7e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 VIRTPWR SLEEP VPWR VPB phighvt w=7e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1003 VPWR SLEEP VIRTPWR VPB phighvt w=7e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VIRTPWR SLEEP VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=7e+06u l=150000u
+X1 VIRTPWR SLEEP VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=7e+06u l=150000u
+X2 VPWR SLEEP VIRTPWR VPB sky130_fd_pr__pfet_01v8_hvt w=7e+06u l=150000u
+X3 VPWR SLEEP VIRTPWR VPB sky130_fd_pr__pfet_01v8_hvt w=7e+06u l=150000u
 .ends
diff --git a/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.cdl b/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.cdl
index b621cf3..ae1d4c5 100644
--- a/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.cdl
+++ b/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.cdl
@@ -17,76 +17,76 @@
 .SUBCKT sky130_fd_sc_lp__srdlrtp_1 D GATE RESET_B SLEEP_B KAPWR VGND VNB VPB VPWR Q
 *.PININFO D:I GATE:I RESET_B:I SLEEP_B:I KAPWR:I VGND:I VNB:I VPB:I
 *.PININFO VPWR:I Q:O
-MI20 net146 db VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI20 net146 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI673 net78 net68 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI675 sleep SLEEP_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
+MI642 clkneg GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI674 net68 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
+MI678 net83 sleep VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI673 net78 net68 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
-MI675 sleep SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI657 net83 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
-MI642 clkneg GATE VNB nshort 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI652 net155 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
-MI674 net68 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
-MI678 net83 sleep VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 Q net155 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI637 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 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 net83 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI654 net110 net68 VNB nfet_01v8 m=1 w=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 net155 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
-MI653 Q net155 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net110 net68 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI671 net58 SLEEP_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
-MI671 net58 SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI670 net59 SLEEP_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
-MI670 net59 SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI676 net106 SLEEP_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 net106 SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI687 net073 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
-MI687 net073 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI686 net146 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
-MI686 net146 clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI683 net47 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
-MI683 net47 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI643 clkneg GATE 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
-MI643 clkneg GATE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI679 net68 RESET_B 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
-MI679 net68 RESET_B VPB phighvt m=1 w=1.0 l=0.25 mult=1 sa=0.265
+MI635 clkpos clkneg 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
+MI662 net167 net68 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
-MI635 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI664 s0 clkpos 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
-MI662 net167 net68 VPB phighvt m=1 w=1.0 l=0.25 mult=1 sa=0.265
+MI658 net68 s0 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
-MI664 s0 clkpos VPB phighvt 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
-MI658 net68 s0 VPB phighvt 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
-MI663 net155 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
-MI660 Q net155 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net146 db 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
-MI638 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
-MI672 clkneg SLEEP_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI663 net155 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
-MI680 net174 sleep VPB phighvt m=1 w=1.0 l=0.25 mult=1 sa=0.265
+MI660 Q net155 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI677 sleep SLEEP_B VPB phighvt m=1 w=1.0 l=0.25 mult=1 sa=0.265
+MI18 net146 db 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
-MI685 net0153 clkneg VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI638 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
-MI684 net146 clkneg VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI672 clkneg SLEEP_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
+MI680 net174 sleep 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
-MI682 db RESET_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI677 sleep SLEEP_B 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
+MI685 net0153 clkneg 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
+MI684 net146 clkneg 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
+MI682 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_lp__srdlrtp_1
diff --git a/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.netlist.tsv b/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.netlist.tsv
index 31f6a8d..2722744 100644
--- a/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.netlist.tsv
+++ b/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.netlist.tsv
@@ -1,38 +1,38 @@
 sky130_fd_sc_lp__srdlrtp_1	D:I GATE:I RESET_B:I SLEEP_B:I KAPWR: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
-MI20	MOSFET	net146	db	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI673	MOSFET	net78	net68	net110	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	sleep	SLEEP_B	net106	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	clkneg	GATE	net59	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI674	MOSFET	net68	s0	net94	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI678	MOSFET	net83	sleep	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	net47	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net94	s0	net83	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net83	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net78	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net155	s0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net155	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net110	net68	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI671	MOSFET	net58	SLEEP_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net59	SLEEP_B	net58	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI676	MOSFET	net106	SLEEP_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI687	MOSFET	net073	clkpos	s0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI686	MOSFET	net146	clkpos	net073	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI683	MOSFET	net47	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	clkneg	GATE	KAPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI679	MOSFET	net68	RESET_B	net174	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net167	net68	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net167	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net68	s0	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net155	s0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net155	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net146	db	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI672	MOSFET	clkneg	SLEEP_B	KAPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI680	MOSFET	net174	sleep	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	sleep	SLEEP_B	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI685	MOSFET	net0153	clkneg	s0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI684	MOSFET	net146	clkneg	net0153	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI682	MOSFET	db	RESET_B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net146	db	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI673	MOSFET	net78	net68	net110	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI675	MOSFET	sleep	SLEEP_B	net106	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkneg	GATE	net59	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI674	MOSFET	net68	s0	net94	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI678	MOSFET	net83	sleep	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	net47	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net94	s0	net83	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net83	RESET_B	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	net78	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net155	s0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net155	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net110	net68	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI671	MOSFET	net58	SLEEP_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net59	SLEEP_B	net58	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI676	MOSFET	net106	SLEEP_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI687	MOSFET	net073	clkpos	s0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI686	MOSFET	net146	clkpos	net073	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI683	MOSFET	net47	RESET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	clkneg	GATE	KAPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI679	MOSFET	net68	RESET_B	net174	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net167	net68	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net167	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net68	s0	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net155	s0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net155	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net146	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI672	MOSFET	clkneg	SLEEP_B	KAPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI680	MOSFET	net174	sleep	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	sleep	SLEEP_B	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI685	MOSFET	net0153	clkneg	s0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI684	MOSFET	net146	clkneg	net0153	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI682	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/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.spice b/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.spice
index 4ffbe1f..7e6241d 100644
--- a/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.spice
+++ b/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.spice
@@ -17,76 +17,40 @@
 
 .subckt sky130_fd_sc_lp__srdlrtp_1 D GATE RESET_B SLEEP_B KAPWR VGND VNB VPB VPWR
 + Q
-M1000 a_393_335# GATE KAPWR VPB phighvt w=640000u l=150000u
-+  ad=5.439e+11p pd=3.8e+06u as=1.1128e+12p ps=9.79e+06u
-M1001 VGND SLEEP_B a_1147_97# VNB nshort w=420000u l=150000u
-+  ad=1.19685e+12p pd=1.055e+07u as=8.82e+10p ps=1.26e+06u
-M1002 a_366_97# a_336_71# a_280_97# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1003 a_1344_97# SLEEP_B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1004 KAPWR a_438_97# a_612_71# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=5.1e+11p ps=3.02e+06u
-M1005 a_114_97# D a_27_97# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.197e+11p ps=1.41e+06u
-M1006 a_336_71# a_393_335# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1007 VGND a_1324_394# a_1624_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.415e+11p ps=2.83e+06u
-M1008 a_280_97# a_27_97# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=1.3453e+12p ps=1.069e+07u
-M1009 a_1765_419# a_1324_394# KAPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.1e+11p pd=2.42e+06u as=0p ps=0u
-M1010 a_438_97# a_336_71# a_366_97# VNB nshort w=420000u l=150000u
-+  ad=2.142e+11p pd=1.86e+06u as=0p ps=0u
-M1011 a_1917_47# a_438_97# a_1624_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1012 Q a_2120_55# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1013 a_612_71# a_438_97# a_1917_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1014 a_612_71# RESET_B a_1765_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND a_612_71# a_642_97# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1016 Q a_2120_55# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1017 VGND a_438_97# a_2120_55# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1018 a_423_487# a_393_335# a_280_97# VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1019 a_1069_97# GATE a_393_335# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.197e+11p ps=1.41e+06u
-M1020 a_1147_97# SLEEP_B a_1069_97# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_438_97# a_393_335# a_423_487# VPB phighvt w=640000u l=150000u
-+  ad=4.674e+11p pd=4.42e+06u as=0p ps=0u
-M1022 a_1624_47# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1324_394# SLEEP_B KAPWR VPB phighvt w=1e+06u l=250000u
-+  ad=5.131e+11p pd=3.58e+06u as=0p ps=0u
-M1024 a_570_97# a_393_335# a_438_97# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1025 a_280_97# a_27_97# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_642_97# a_612_71# a_570_97# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1565_419# a_336_71# a_438_97# VPB phighvt w=1e+06u l=250000u
-+  ad=2.1e+11p pd=2.42e+06u as=0p ps=0u
-M1028 KAPWR a_612_71# a_1565_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1324_394# SLEEP_B a_1344_97# VNB nshort w=420000u l=150000u
-+  ad=1.68e+11p pd=1.64e+06u as=0p ps=0u
-M1030 VGND RESET_B a_114_97# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VPWR RESET_B a_27_97# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.24e+11p ps=1.98e+06u
-M1032 a_27_97# D VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 VPWR a_393_335# a_336_71# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.6615e+11p ps=2.15e+06u
-M1034 VPWR a_438_97# a_2120_55# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1035 KAPWR SLEEP_B a_393_335# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_570_97# a_612_71# a_642_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 VPWR a_2120_55# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 a_336_71# a_393_335# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_366_97# a_336_71# a_438_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_642_97# a_612_71# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR D a_27_97# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 KAPWR a_1324_394# a_1765_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_2120_55# a_438_97# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 VGND a_27_97# a_280_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_1624_47# a_438_97# a_1917_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VGND a_393_335# a_336_71# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_27_97# RESET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 a_1565_419# a_612_71# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X13 a_438_97# a_393_335# a_570_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_280_97# a_393_335# a_423_487# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X15 a_423_487# a_393_335# a_438_97# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X16 VGND a_2120_55# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_280_97# a_336_71# a_366_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_1069_97# SLEEP_B a_1147_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_393_335# SLEEP_B KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 a_1147_97# SLEEP_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_1624_47# a_1324_394# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 a_2120_55# a_438_97# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VPWR a_27_97# a_280_97# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X24 a_438_97# a_336_71# a_1565_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X25 a_1765_419# RESET_B a_612_71# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X26 KAPWR SLEEP_B a_1324_394# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X27 a_114_97# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 VGND SLEEP_B a_1344_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 VGND RESET_B a_1624_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_27_97# D a_114_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_1344_97# SLEEP_B a_1324_394# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 a_1917_47# a_438_97# a_612_71# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 a_612_71# a_438_97# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X34 a_393_335# GATE a_1069_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 KAPWR GATE a_393_335# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/srdlstp/sky130_fd_sc_lp__srdlstp_1.cdl b/cells/srdlstp/sky130_fd_sc_lp__srdlstp_1.cdl
index 9701a56..49a443b 100644
--- a/cells/srdlstp/sky130_fd_sc_lp__srdlstp_1.cdl
+++ b/cells/srdlstp/sky130_fd_sc_lp__srdlstp_1.cdl
@@ -17,74 +17,74 @@
 .SUBCKT sky130_fd_sc_lp__srdlstp_1 D GATE SET_B SLEEP_B KAPWR VGND VNB VPB VPWR Q
 *.PININFO D:I GATE:I SET_B:I SLEEP_B:I KAPWR:I VGND:I VNB:I VPB:I
 *.PININFO VPWR:I Q:O
-MI638 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
-MI684 net120 sleep VPB phighvt m=1 w=1.0 l=0.25 mult=1 sa=0.265
+MI638 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
-MI663 net156 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
-MI660 Q net156 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI6 net103 S1 VPB phighvt 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
-MI669 S0 clkpos VPB phighvt 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
-MI674 clkneg SLEEP_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI684 net120 sleep 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
-MI648 S1 S0 VPB phighvt m=1 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
+MI663 net156 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
+MI660 Q net156 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI6 net103 S1 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
+MI669 S0 clkpos 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
+MI674 clkneg SLEEP_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
+MI648 S1 S0 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
+MI37 net168 db VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI681 sleep SLEEP_B 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
+MI643 clkneg GATE 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
+MI635 clkpos clkneg 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
+MI685 S0 SET_B 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
+MI690 net72 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
+MI689 net168 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
+MI680 net175 SLEEP_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
+MI670 net139 SLEEP_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
+MI27 net163 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
-MI37 net168 db VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI678 net188 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
+MI683 net180 sleep VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI682 net180 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
+MI679 sleep SLEEP_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
+MI677 net172 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
+MI36 net168 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
+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
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI652 net156 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
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI681 sleep SLEEP_B VPB phighvt m=1 w=1.0 l=0.25 mult=1 sa=0.265
+MI673 net148 SLEEP_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
-MI643 clkneg GATE VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI653 Q net156 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI635 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI642 clkneg GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI685 S0 SET_B VPB phighvt 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
-MI690 net72 clkneg VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI692 net131 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
-MI689 net168 clkneg VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI691 net168 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
-MI680 net175 SLEEP_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
-MI670 net139 SLEEP_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
-MI27 net163 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
-MI678 net188 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
-MI683 net180 sleep VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI682 net180 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
-MI679 sleep SLEEP_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
-MI677 net172 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
-MI36 net168 db VNB nshort m=1 w=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
-MI636 clkpos 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 net156 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
-MI637 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
-MI673 net148 SLEEP_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
-MI653 Q net156 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 clkneg GATE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
-+ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI692 net131 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
-MI691 net168 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
-MI688 net128 SET_B VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI688 net128 SET_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_lp__srdlstp_1
diff --git a/cells/srdlstp/sky130_fd_sc_lp__srdlstp_1.netlist.tsv b/cells/srdlstp/sky130_fd_sc_lp__srdlstp_1.netlist.tsv
index 8413233..84429f1 100644
--- a/cells/srdlstp/sky130_fd_sc_lp__srdlstp_1.netlist.tsv
+++ b/cells/srdlstp/sky130_fd_sc_lp__srdlstp_1.netlist.tsv
@@ -1,37 +1,37 @@
 sky130_fd_sc_lp__srdlstp_1	D:I GATE:I SET_B:I SLEEP_B:I KAPWR: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
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI684	MOSFET	net120	sleep	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net156	S0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net156	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net103	S1	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkpos	net103	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI674	MOSFET	clkneg	SLEEP_B	KAPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net168	db	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI681	MOSFET	sleep	SLEEP_B	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	clkneg	GATE	KAPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI685	MOSFET	S0	SET_B	net120	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI690	MOSFET	net72	clkneg	S0	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI689	MOSFET	net168	clkneg	net72	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI680	MOSFET	net175	SLEEP_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net139	SLEEP_B	net148	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net163	S1	net172	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	net188	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI678	MOSFET	net188	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI683	MOSFET	net180	sleep	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI682	MOSFET	net180	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI679	MOSFET	sleep	SLEEP_B	net175	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	net172	S1	net180	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net168	db	net128	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	S0	clkneg	net163	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net156	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI673	MOSFET	net148	SLEEP_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net156	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	clkneg	GATE	net139	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI692	MOSFET	net131	clkpos	S0	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI691	MOSFET	net168	clkpos	net131	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI688	MOSFET	net128	SET_B	VGND	VNB	nshort	1	0.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI684	MOSFET	net120	sleep	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net156	S0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net156	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net103	S1	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkpos	net103	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI674	MOSFET	clkneg	SLEEP_B	KAPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net168	db	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI681	MOSFET	sleep	SLEEP_B	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	clkneg	GATE	KAPWR	VPB	pfet_01v8_hvt	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI685	MOSFET	S0	SET_B	net120	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI690	MOSFET	net72	clkneg	S0	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI689	MOSFET	net168	clkneg	net72	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI680	MOSFET	net175	SLEEP_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net139	SLEEP_B	net148	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net163	S1	net172	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	net188	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI678	MOSFET	net188	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI683	MOSFET	net180	sleep	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI682	MOSFET	net180	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI679	MOSFET	sleep	SLEEP_B	net175	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	net172	S1	net180	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net168	db	net128	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	S0	clkneg	net163	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net156	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI673	MOSFET	net148	SLEEP_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	net156	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkneg	GATE	net139	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI692	MOSFET	net131	clkpos	S0	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI691	MOSFET	net168	clkpos	net131	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI688	MOSFET	net128	SET_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/srdlstp/sky130_fd_sc_lp__srdlstp_1.spice b/cells/srdlstp/sky130_fd_sc_lp__srdlstp_1.spice
index 03a9521..bc0b440 100644
--- a/cells/srdlstp/sky130_fd_sc_lp__srdlstp_1.spice
+++ b/cells/srdlstp/sky130_fd_sc_lp__srdlstp_1.spice
@@ -16,74 +16,39 @@
 
 
 .subckt sky130_fd_sc_lp__srdlstp_1 D GATE SET_B SLEEP_B KAPWR VGND VNB VPB VPWR Q
-M1000 KAPWR a_878_357# a_830_419# VPB phighvt w=1e+06u l=250000u
-+  ad=1.5209e+12p pd=1.116e+07u as=2.4e+11p ps=2.48e+06u
-M1001 a_1294_315# SLEEP_B KAPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1002 KAPWR a_1294_315# a_1246_341# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1003 KAPWR SLEEP_B a_404_353# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=3.214e+11p ps=3.05e+06u
-M1004 a_1876_174# SLEEP_B a_1798_174# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.008e+11p ps=1.32e+06u
-M1005 a_217_130# a_27_400# VPWR VPB phighvt w=840000u l=150000u
-+  ad=4.62e+11p pd=4.46e+06u as=1.2906e+12p ps=9.22e+06u
-M1006 a_878_357# a_700_451# a_1455_127# VNB nshort w=420000u l=150000u
-+  ad=2.44275e+11p pd=2.18e+06u as=1.512e+11p ps=1.56e+06u
-M1007 a_404_353# GATE KAPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 Q a_2266_367# VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=1.0306e+12p ps=1.123e+07u
-M1009 a_878_357# a_700_451# KAPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1010 a_434_405# a_404_353# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.76e+11p pd=1.83e+06u as=0p ps=0u
-M1011 a_988_47# SET_B VGND VNB nshort w=420000u l=150000u
-+  ad=3.9215e+11p pd=3.72e+06u as=0p ps=0u
-M1012 a_916_47# a_878_357# a_844_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=8.82e+10p ps=1.26e+06u
-M1013 a_1798_174# GATE a_404_353# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.638e+11p ps=1.62e+06u
-M1014 a_830_419# a_434_405# a_700_451# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=8.201e+11p ps=5.86e+06u
-M1015 VGND SLEEP_B a_2144_131# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1016 a_988_47# a_878_357# a_916_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_2266_367# a_700_451# VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1018 Q a_2266_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1019 a_667_47# a_434_405# a_217_130# VNB nshort w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=3.392e+11p ps=3.62e+06u
-M1020 VGND a_1294_315# a_988_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_700_451# a_434_405# a_667_47# VNB nshort w=640000u l=150000u
-+  ad=2.158e+11p pd=2.03e+06u as=0p ps=0u
-M1022 a_1455_127# a_700_451# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_2144_131# SLEEP_B a_1294_315# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.176e+11p ps=1.4e+06u
-M1024 a_27_400# D VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
-M1025 VGND SET_B a_300_130# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.7e+06u
-M1026 a_1246_341# SET_B a_700_451# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VPWR a_700_451# a_2266_367# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1028 VPWR D a_27_400# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.76e+11p ps=1.83e+06u
-M1029 a_844_47# a_404_353# a_700_451# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_700_451# a_404_353# a_628_451# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=1.764e+11p ps=2.1e+06u
-M1031 a_300_130# a_27_400# a_217_130# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 VGND SLEEP_B a_1876_174# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_628_451# a_404_353# a_217_130# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_434_405# a_404_353# VGND VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=0p ps=0u
+X0 a_217_130# a_27_400# a_300_130# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 a_1294_315# SLEEP_B a_2144_131# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_700_451# a_404_353# a_844_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_667_47# a_434_405# a_700_451# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_988_47# a_1294_315# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_830_419# a_878_357# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X6 a_844_47# a_878_357# a_916_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_217_130# a_404_353# a_628_451# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X8 VGND SET_B a_988_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 KAPWR SLEEP_B a_1294_315# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X10 a_1455_127# a_700_451# a_878_357# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_700_451# SET_B a_1246_341# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 a_404_353# SLEEP_B KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 a_700_451# a_434_405# a_830_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X14 a_2144_131# SLEEP_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VPWR a_27_400# a_217_130# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 VGND a_700_451# a_1455_127# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_404_353# GATE a_1798_174# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_1246_341# a_1294_315# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X19 a_217_130# a_434_405# a_667_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X20 a_1876_174# SLEEP_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_628_451# a_404_353# a_700_451# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X22 KAPWR a_700_451# a_878_357# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X23 a_2266_367# a_700_451# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X24 VGND a_700_451# a_2266_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_1798_174# SLEEP_B a_1876_174# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 VGND D a_27_400# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 VPWR a_404_353# a_434_405# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X28 VPWR a_2266_367# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X29 a_300_130# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X30 a_916_47# a_878_357# a_988_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 KAPWR GATE a_404_353# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X32 VGND a_2266_367# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X33 a_27_400# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X34 VGND a_404_353# a_434_405# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.cdl b/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.cdl
index 936e3f4..6d1269d 100644
--- a/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.cdl
+++ b/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.cdl
@@ -16,58 +16,58 @@
 
 .SUBCKT sky130_fd_sc_lp__srdlxtp_1 D GATE SLEEP_B KAPWR VGND VNB VPB VPWR Q
 *.PININFO D:I GATE:I SLEEP_B:I KAPWR:I VGND:I VNB:I VPB:I VPWR:I Q:O
-MI673 net74 net88 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI673 net74 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
-MI642 clkneg GATE VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI642 clkneg GATE VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg 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.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI674 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
-MI637 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
-MI20 net62 db VNB nshort m=1 w=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 net71 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 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 net119 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
-MI653 Q net119 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net87 net88 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI674 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
-MI671 net91 SLEEP_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
-MI670 net46 SLEEP_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
-MI679 net043 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
-MI678 net62 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
-MI643 clkneg GATE 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
-MI635 clkpos clkneg 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 net107 net88 VPB phighvt 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
-MI664 s0 clkpos VPB phighvt m=1 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
+MI637 db D VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI658 net88 s0 VPB phighvt m=1 w=1.0 l=0.25 mult=1 sa=0.265 sb=0.265
+MI20 net62 db VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net119 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
-MI660 Q net119 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI18 net62 db 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
-MI638 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
-MI672 clkneg SLEEP_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI656 net71 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
-MI677 net0106 clkneg 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
-MI676 net62 clkneg VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI652 net119 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
+MI653 Q net119 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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
+MI671 net91 SLEEP_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
+MI670 net46 SLEEP_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
+MI679 net043 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
+MI678 net62 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
+MI643 clkneg GATE 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
+MI635 clkpos clkneg 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
+MI662 net107 net88 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
+MI664 s0 clkpos 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
+MI658 net88 s0 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
+MI663 net119 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
+MI660 Q net119 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI18 net62 db 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
+MI638 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
+MI672 clkneg SLEEP_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
+MI677 net0106 clkneg 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
+MI676 net62 clkneg 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_lp__srdlxtp_1
diff --git a/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.netlist.tsv b/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.netlist.tsv
index 4d44ba0..1e78196 100644
--- a/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.netlist.tsv
+++ b/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.netlist.tsv
@@ -1,29 +1,29 @@
 sky130_fd_sc_lp__srdlxtp_1	D:I GATE:I SLEEP_B:I KAPWR: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
-MI673	MOSFET	net74	net88	net87	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	clkneg	GATE	net46	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI674	MOSFET	net88	s0	net71	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI637	MOSFET	db	D	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI20	MOSFET	net62	db	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	net71	s0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net74	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net119	s0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net119	VGND	VNB	nshort	1	0.84	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
-MI671	MOSFET	net91	SLEEP_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net46	SLEEP_B	net91	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI679	MOSFET	net043	clkpos	s0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI678	MOSFET	net62	clkpos	net043	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	clkneg	GATE	KAPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net107	net88	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net107	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net88	s0	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net119	s0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net119	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI18	MOSFET	net62	db	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI638	MOSFET	db	D	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI672	MOSFET	clkneg	SLEEP_B	KAPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	net0106	clkneg	s0	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI676	MOSFET	net62	clkneg	net0106	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI673	MOSFET	net74	net88	net87	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkneg	GATE	net46	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI674	MOSFET	net88	s0	net71	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI637	MOSFET	db	D	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI20	MOSFET	net62	db	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	net71	s0	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	net74	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net119	s0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net119	VGND	VNB	nfet_01v8	1	0.84	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
+MI671	MOSFET	net91	SLEEP_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net46	SLEEP_B	net91	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI679	MOSFET	net043	clkpos	s0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI678	MOSFET	net62	clkpos	net043	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	clkneg	GATE	KAPWR	VPB	pfet_01v8_hvt	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net107	net88	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net107	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net88	s0	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net119	s0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net119	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI18	MOSFET	net62	db	VPWR	VPB	pfet_01v8_hvt	1	0.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI672	MOSFET	clkneg	SLEEP_B	KAPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	net0106	clkneg	s0	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI676	MOSFET	net62	clkneg	net0106	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/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.spice b/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.spice
index 63cfa2a..2ea9201 100644
--- a/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.spice
+++ b/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.spice
@@ -16,58 +16,31 @@
 
 
 .subckt sky130_fd_sc_lp__srdlxtp_1 D GATE SLEEP_B KAPWR VGND VNB VPB VPWR Q
-M1000 VPWR a_662_47# a_1530_367# VPB phighvt w=640000u l=150000u
-+  ad=1.3145e+12p pd=8.5e+06u as=1.824e+11p ps=1.85e+06u
-M1001 KAPWR a_831_21# a_849_419# VPB phighvt w=1e+06u l=250000u
-+  ad=8.676e+11p pd=7.35e+06u as=2.4e+11p ps=2.48e+06u
-M1002 a_590_47# a_114_179# a_476_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.764e+11p ps=1.68e+06u
-M1003 a_662_47# a_114_179# a_590_47# VNB nshort w=420000u l=150000u
-+  ad=1.911e+11p pd=1.75e+06u as=0p ps=0u
-M1004 a_114_179# a_84_153# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1005 a_831_21# a_662_47# a_1019_47# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=8.82e+10p ps=1.26e+06u
-M1006 a_783_47# a_84_153# a_662_47# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1007 a_861_47# a_831_21# a_783_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1008 Q a_1530_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1009 VGND a_831_21# a_861_47# VNB nshort w=420000u l=150000u
-+  ad=9.278e+11p pd=8.95e+06u as=0p ps=0u
-M1010 Q a_1530_367# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1011 VGND a_662_47# a_1530_367# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1012 a_476_47# a_226_491# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=0p ps=0u
-M1013 a_114_179# a_84_153# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1014 VGND D a_226_491# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1015 a_621_491# a_84_153# a_476_47# VPB phighvt w=640000u l=150000u
-+  ad=2.208e+11p pd=1.97e+06u as=0p ps=0u
-M1016 a_1019_47# a_662_47# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1361_47# SLEEP_B a_1289_47# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=8.82e+10p ps=1.26e+06u
-M1018 KAPWR SLEEP_B a_84_153# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=2.688e+11p ps=2.12e+06u
-M1019 VGND SLEEP_B a_1361_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_849_419# a_114_179# a_662_47# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=3.554e+11p ps=2.79e+06u
-M1021 KAPWR a_662_47# a_831_21# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
-M1022 VPWR D a_226_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1023 a_1289_47# GATE a_84_153# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1024 a_662_47# a_84_153# a_621_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_476_47# a_226_491# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_84_153# GATE KAPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_84_153# GATE a_1289_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_1361_47# SLEEP_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_226_491# D VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 VGND a_226_491# a_476_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_861_47# a_831_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 KAPWR GATE a_84_153# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X6 a_476_47# a_114_179# a_590_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR a_1530_367# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_662_47# a_114_179# a_849_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_1289_47# SLEEP_B a_1361_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_226_491# D VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_476_47# a_84_153# a_621_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 a_783_47# a_831_21# a_861_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_849_419# a_831_21# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X14 VGND a_1530_367# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X15 a_1530_367# a_662_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X16 VGND a_84_153# a_114_179# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_621_491# a_84_153# a_662_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 a_84_153# SLEEP_B KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 a_831_21# a_662_47# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X20 VPWR a_226_491# a_476_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X21 VPWR a_84_153# a_114_179# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 a_1530_367# a_662_47# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_590_47# a_114_179# a_662_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_662_47# a_84_153# a_783_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 VGND a_662_47# a_1019_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_1019_47# a_662_47# a_831_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sregrbp/sky130_fd_sc_lp__sregrbp_1.cdl b/cells/sregrbp/sky130_fd_sc_lp__sregrbp_1.cdl
index 9b0d844..fe61880 100644
--- a/cells/sregrbp/sky130_fd_sc_lp__sregrbp_1.cdl
+++ b/cells/sregrbp/sky130_fd_sc_lp__sregrbp_1.cdl
@@ -17,92 +17,92 @@
 .SUBCKT sky130_fd_sc_lp__sregrbp_1 ASYNC CLK D SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO ASYNC:I CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI7 net254 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
-MI8 net169 SCE VPB phighvt m=1 w=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 net157 SCD VPB phighvt m=1 w=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 net254 sceb VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI7 net254 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
-MI643 clkneg CLK VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MI8 net169 SCE VPB pfet_01v8_hvt m=1 w=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 s1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI48 s1 ASYNC 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 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
-MI659 m1 ASYNC 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
-MI38 net134 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
-MI39 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
-MI43 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
-MI42 net125 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
-MI633 sceb SCE VPB phighvt m=1 w=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 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
-MI57 net174 net254 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI9 net157 SCD VPB pfet_01v8_hvt m=1 w=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 clkpos clkneg VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MI10 net254 sceb VPB pfet_01v8_hvt m=1 w=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 net102 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
-MI660 Q_N net234 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net234 s1 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
-MI58 net174 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI661 Q s1 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 net258 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.063 perim=1.14
-MI3 net254 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
-MI5 net254 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
-MI6 net246 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.063 perim=1.14
-MI651 Q s1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-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
-MI652 net234 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
-MI653 Q_N net234 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net226 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
-MI656 m1 ASYNC VNB nshort m=1 w=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 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
-MI45 net214 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
-MI44 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
-MI51 net197 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
-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
-MI50 s1 ASYNC VNB nshort m=1 w=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 net194 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
-MI59 net174 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI48 s1 ASYNC VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI41 net217 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
-MI642 clkneg CLK VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI658 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
-MI56 net174 net254 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI659 m1 ASYNC VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 net134 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
+MI39 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
+MI43 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
+MI42 net125 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
+MI633 sceb SCE VPB pfet_01v8_hvt m=1 w=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 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
+MI57 net174 net254 VPB pfet_01v8_hvt m=1 w=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 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 net102 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
+MI660 Q_N net234 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net234 s1 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
+MI58 net174 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
+MI2 net258 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.063 perim=1.14
+MI3 net254 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
+MI5 net254 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
+MI6 net246 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
+MI651 Q s1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+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
+MI652 net234 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
+MI653 Q_N net234 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net226 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
+MI656 m1 ASYNC VNB nfet_01v8 m=1 w=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 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
+MI45 net214 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
+MI44 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
+MI51 net197 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
+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
+MI50 s1 ASYNC VNB nfet_01v8 m=1 w=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 net194 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
+MI59 net174 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
+MI41 net217 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
+MI642 clkneg CLK VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI56 net174 net254 VNB nfet_01v8 m=1 w=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_lp__sregrbp_1
diff --git a/cells/sregrbp/sky130_fd_sc_lp__sregrbp_1.netlist.tsv b/cells/sregrbp/sky130_fd_sc_lp__sregrbp_1.netlist.tsv
index aa4cddf..7638a4e 100644
--- a/cells/sregrbp/sky130_fd_sc_lp__sregrbp_1.netlist.tsv
+++ b/cells/sregrbp/sky130_fd_sc_lp__sregrbp_1.netlist.tsv
@@ -1,46 +1,46 @@
 sky130_fd_sc_lp__sregrbp_1	ASYNC:I 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
-MI7	MOSFET	net254	D	net169	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net169	SCE	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net157	SCD	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net254	sceb	net157	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q	s1	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI48	MOSFET	s1	ASYNC	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	m0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	m1	ASYNC	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net134	m1	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	s0	clkneg	net134	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	s0	clkpos	net125	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net125	s1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	s1	s0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI57	MOSFET	net174	net254	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net102	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	net102	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q_N	net234	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net234	s1	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI58	MOSFET	net174	clkpos	m0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	net258	sceb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	net254	D	net258	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net254	SCE	net246	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net246	SCD	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q	s1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m0	clkpos	net194	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net234	s1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q_N	net234	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net226	m0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	ASYNC	net226	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	s0	clkpos	net217	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	net214	s1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	s0	clkneg	net214	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI51	MOSFET	net197	s0	VGND	VNB	nshort	1	0.64	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
-MI50	MOSFET	s1	ASYNC	net197	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net194	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI59	MOSFET	net174	clkneg	m0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	net217	m1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI56	MOSFET	net174	net254	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net254	D	net169	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net169	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net157	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net254	sceb	net157	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q	s1	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI48	MOSFET	s1	ASYNC	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	m0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	m1	ASYNC	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net134	m1	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	s0	clkneg	net134	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	s0	clkpos	net125	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net125	s1	VPWR	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	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
+MI57	MOSFET	net174	net254	VPWR	VPB	pfet_01v8_hvt	1	0.42	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	MOSFET	net102	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	net102	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	net234	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net234	s1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI58	MOSFET	net174	clkpos	m0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	net258	sceb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	net254	D	net258	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net254	SCE	net246	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net246	SCD	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI651	MOSFET	Q	s1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m0	clkpos	net194	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net234	s1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q_N	net234	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net226	m0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	ASYNC	net226	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	s0	clkpos	net217	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	net214	s1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	s0	clkneg	net214	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI51	MOSFET	net197	s0	VGND	VNB	nfet_01v8	1	0.64	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
+MI50	MOSFET	s1	ASYNC	net197	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net194	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI59	MOSFET	net174	clkneg	m0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	net217	m1	VGND	VNB	nfet_01v8	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI56	MOSFET	net174	net254	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/sregrbp/sky130_fd_sc_lp__sregrbp_1.spice b/cells/sregrbp/sky130_fd_sc_lp__sregrbp_1.spice
index 2022151..73c180c 100644
--- a/cells/sregrbp/sky130_fd_sc_lp__sregrbp_1.spice
+++ b/cells/sregrbp/sky130_fd_sc_lp__sregrbp_1.spice
@@ -16,92 +16,48 @@
 
 
 .subckt sky130_fd_sc_lp__sregrbp_1 ASYNC CLK D SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 a_264_531# SCE VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.70875e+12p ps=2.163e+07u
-M1001 VGND a_1273_393# a_1319_119# VNB nshort w=420000u l=150000u
-+  ad=1.864e+12p pd=1.682e+07u as=8.82e+10p ps=1.26e+06u
-M1002 a_1825_125# a_1273_393# VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1003 a_2083_65# ASYNC a_2222_47# VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=1.344e+11p ps=1.7e+06u
-M1004 VGND a_2083_65# Q VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.25e+06u
-M1005 VPWR CLK a_761_357# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.591e+11p ps=3.09e+06u
-M1006 VGND a_2083_65# a_2035_91# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1007 a_2042_451# a_934_357# a_1903_125# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.856e+11p ps=2.47e+06u
-M1008 VPWR a_2083_65# a_2042_451# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1139_463# a_934_357# a_636_531# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.394e+11p ps=2.82e+06u
-M1010 a_1273_393# ASYNC a_1501_119# VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=1.536e+11p ps=1.76e+06u
-M1011 VPWR a_2083_65# Q VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.591e+11p ps=3.09e+06u
-M1012 a_312_47# a_75_531# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1013 a_342_531# D a_312_47# VNB nshort w=420000u l=150000u
-+  ad=1.386e+11p pd=1.5e+06u as=0p ps=0u
-M1014 Q_N a_2456_451# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1015 a_2083_65# a_1903_125# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1016 Q_N a_2456_451# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1017 a_1225_463# a_761_357# a_1139_463# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1018 a_1831_373# a_1273_393# VPWR VPB phighvt w=840000u l=150000u
-+  ad=3.276e+11p pd=2.76e+06u as=0p ps=0u
-M1019 VPWR a_1139_463# a_1273_393# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=4.788e+11p ps=4.5e+06u
-M1020 a_342_531# D a_264_531# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1021 a_2035_91# a_761_357# a_1903_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.515e+11p ps=2.64e+06u
-M1022 a_75_531# SCE VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1023 a_2456_451# a_2083_65# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1024 a_486_47# SCE a_342_531# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1025 VGND SCD a_486_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_2456_451# a_2083_65# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1027 a_1903_125# a_934_357# a_1825_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR SCD a_428_531# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.596e+11p ps=1.6e+06u
-M1029 a_934_357# a_761_357# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1030 a_428_531# a_75_531# a_342_531# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_636_531# a_342_531# VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1139_463# a_761_357# a_636_531# VNB nshort w=420000u l=150000u
-+  ad=1.827e+11p pd=1.71e+06u as=2.394e+11p ps=2.82e+06u
-M1033 VPWR a_1273_393# a_1225_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1273_393# ASYNC VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR ASYNC a_2083_65# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_636_531# a_342_531# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_1319_119# a_934_357# a_1139_463# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1501_119# a_1139_463# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND CLK a_761_357# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.25e+06u
-M1040 a_2222_47# a_1903_125# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VPWR SCE a_75_531# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1042 a_1903_125# a_761_357# a_1831_373# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_934_357# a_761_357# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
+X0 a_1225_463# a_1273_393# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_1831_373# a_761_357# a_1903_125# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 a_342_531# SCE a_486_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_1825_125# a_934_357# a_1903_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_264_531# D a_342_531# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VGND a_761_357# a_934_357# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Q a_2083_65# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_75_531# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VPWR a_342_531# a_636_531# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VPWR a_1903_125# a_2083_65# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 a_761_357# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VGND a_2083_65# a_2456_451# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND a_2456_451# Q_N VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VGND a_75_531# a_312_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VGND SCE a_75_531# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VPWR a_1273_393# a_1831_373# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 a_761_357# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_1139_463# a_761_357# a_1225_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 a_1501_119# ASYNC a_1273_393# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 a_1139_463# a_934_357# a_1319_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_2083_65# ASYNC VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X21 VPWR SCE a_264_531# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 VPWR a_2083_65# a_2456_451# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X23 Q a_2083_65# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 a_2222_47# ASYNC a_2083_65# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X25 a_342_531# a_75_531# a_428_531# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X26 VPWR a_761_357# a_934_357# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 a_486_47# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_636_531# a_934_357# a_1139_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X29 a_1903_125# a_934_357# a_2042_451# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X30 VGND a_342_531# a_636_531# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_2042_451# a_2083_65# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X32 VGND a_1139_463# a_1501_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X33 VGND a_1273_393# a_1825_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X34 a_1273_393# a_1139_463# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X35 a_1319_119# a_1273_393# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 VPWR a_2456_451# Q_N VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X37 a_1903_125# a_761_357# a_2035_91# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 a_428_531# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X39 a_312_47# D a_342_531# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X40 a_636_531# a_761_357# a_1139_463# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X41 VGND a_1903_125# a_2222_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X42 VPWR ASYNC a_1273_393# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X43 a_2035_91# a_2083_65# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/sregsbp/sky130_fd_sc_lp__sregsbp_1.cdl b/cells/sregsbp/sky130_fd_sc_lp__sregsbp_1.cdl
index b408d9a..fd88429 100644
--- a/cells/sregsbp/sky130_fd_sc_lp__sregsbp_1.cdl
+++ b/cells/sregsbp/sky130_fd_sc_lp__sregsbp_1.cdl
@@ -17,92 +17,92 @@
 .SUBCKT sky130_fd_sc_lp__sregsbp_1 ASYNC CLK D SCD SCE VGND VNB VPB VPWR Q Q_N
 *.PININFO ASYNC:I CLK:I D:I SCD:I SCE:I VGND:I VNB:I VPB:I VPWR:I Q:O
 *.PININFO Q_N:O
-MI7 net255 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
-MI8 net170 SCE VPB phighvt m=1 w=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 net158 SCD VPB phighvt m=1 w=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 net255 sceb VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI7 net255 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
-MI643 clkneg CLK VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MI8 net170 SCE VPB pfet_01v8_hvt m=1 w=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 s1 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI48 s1 ASYNC 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 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
-MI659 m1 ASYNC 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
-MI38 net135 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
-MI39 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
-MI43 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
-MI42 net126 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
-MI633 sceb SCE VPB phighvt m=1 w=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 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
-MI635 clkpos clkneg VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MI9 net158 SCD VPB pfet_01v8_hvt m=1 w=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 net107 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
-MI660 Q net235 VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI663 net235 s1 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
-MI57 net175 net255 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI10 net255 sceb VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI58 net255 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI643 clkneg CLK VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI2 net259 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.063 perim=1.14
-MI3 net255 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
-MI5 net255 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
-MI6 net247 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.063 perim=1.14
-MI651 Q_N s1 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-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
-MI652 net235 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
-MI653 Q net235 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI657 net227 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
-MI656 m1 ASYNC VNB nshort m=1 w=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 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
-MI45 net215 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
-MI44 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
-MI51 net198 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
-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
-MI50 s1 ASYNC VNB nshort m=1 w=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 net195 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
-MI41 net218 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
-MI642 clkneg CLK VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkpos clkneg VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI661 Q_N s1 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI60 net255 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI48 s1 ASYNC VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI59 net175 net255 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI658 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
+MI659 m1 ASYNC VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 net135 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
+MI39 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
+MI43 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
+MI42 net126 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
+MI633 sceb SCE VPB pfet_01v8_hvt m=1 w=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 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
+MI635 clkpos clkneg VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1
++ sa=0.265 sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI662 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
+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
+MI660 Q net235 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI663 net235 s1 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
+MI57 net175 net255 VPB pfet_01v8_hvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI58 net255 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
+MI2 net259 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.063 perim=1.14
+MI3 net255 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
+MI5 net255 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
+MI6 net247 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
+MI651 Q_N s1 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+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
+MI652 net235 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
+MI653 Q net235 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net227 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
+MI656 m1 ASYNC VNB nfet_01v8 m=1 w=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 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
+MI45 net215 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
+MI44 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
+MI51 net198 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
+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
+MI50 s1 ASYNC VNB nfet_01v8 m=1 w=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 net195 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
+MI41 net218 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
+MI642 clkneg CLK VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI60 net255 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
+MI59 net175 net255 VNB nfet_01v8 m=1 w=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_lp__sregsbp_1
diff --git a/cells/sregsbp/sky130_fd_sc_lp__sregsbp_1.netlist.tsv b/cells/sregsbp/sky130_fd_sc_lp__sregsbp_1.netlist.tsv
index a6ec7ee..dc87f93 100644
--- a/cells/sregsbp/sky130_fd_sc_lp__sregsbp_1.netlist.tsv
+++ b/cells/sregsbp/sky130_fd_sc_lp__sregsbp_1.netlist.tsv
@@ -1,46 +1,46 @@
 sky130_fd_sc_lp__sregsbp_1	ASYNC:I 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
-MI7	MOSFET	net255	D	net170	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net170	SCE	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net158	SCD	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI10	MOSFET	net255	sceb	net158	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	clkneg	CLK	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI661	MOSFET	Q_N	s1	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI48	MOSFET	s1	ASYNC	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	m1	m0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI659	MOSFET	m1	ASYNC	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net135	m1	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	s0	clkneg	net135	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	s0	clkpos	net126	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net126	s1	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI633	MOSFET	sceb	SCE	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI49	MOSFET	s1	s0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net107	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	net107	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net235	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net235	s1	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI57	MOSFET	net175	net255	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI58	MOSFET	net255	clkpos	m0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	net259	sceb	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI3	MOSFET	net255	D	net259	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net255	SCE	net247	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net247	SCD	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI651	MOSFET	Q_N	s1	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	m0	clkpos	net195	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net235	s1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net235	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net227	m0	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	m1	ASYNC	net227	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI40	MOSFET	s0	clkpos	net218	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	net215	s1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	s0	clkneg	net215	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI51	MOSFET	net198	s0	VGND	VNB	nshort	1	0.64	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
-MI50	MOSFET	s1	ASYNC	net198	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net195	m1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI41	MOSFET	net218	m1	VGND	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	clkneg	CLK	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI60	MOSFET	net255	clkneg	m0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI59	MOSFET	net175	net255	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net255	D	net170	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net170	SCE	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net158	SCD	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI10	MOSFET	net255	sceb	net158	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	clkneg	CLK	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI661	MOSFET	Q_N	s1	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI48	MOSFET	s1	ASYNC	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	m0	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI659	MOSFET	m1	ASYNC	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net135	m1	VPWR	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	s0	clkneg	net135	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	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
+MI42	MOSFET	net126	s1	VPWR	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI49	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
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI662	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
+MI664	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
+MI660	MOSFET	Q	net235	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net235	s1	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI57	MOSFET	net175	net255	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI58	MOSFET	net255	clkpos	m0	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	net259	sceb	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI3	MOSFET	net255	D	net259	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net255	SCE	net247	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net247	SCD	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	s1	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	m0	clkpos	net195	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net235	s1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net235	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net227	m0	VGND	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	m1	ASYNC	net227	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI40	MOSFET	s0	clkpos	net218	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	net215	s1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	s0	clkneg	net215	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI51	MOSFET	net198	s0	VGND	VNB	nfet_01v8	1	0.64	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
+MI50	MOSFET	s1	ASYNC	net198	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net195	m1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI41	MOSFET	net218	m1	VGND	VNB	nfet_01v8	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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI60	MOSFET	net255	clkneg	m0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI59	MOSFET	net175	net255	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/sregsbp/sky130_fd_sc_lp__sregsbp_1.spice b/cells/sregsbp/sky130_fd_sc_lp__sregsbp_1.spice
index 493a7ed..7239c0e 100644
--- a/cells/sregsbp/sky130_fd_sc_lp__sregsbp_1.spice
+++ b/cells/sregsbp/sky130_fd_sc_lp__sregsbp_1.spice
@@ -16,92 +16,48 @@
 
 
 .subckt sky130_fd_sc_lp__sregsbp_1 ASYNC CLK D SCD SCE VGND VNB VPB VPWR Q Q_N
-M1000 a_264_531# SCE VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.70875e+12p ps=2.163e+07u
-M1001 VGND a_1273_393# a_1319_119# VNB nshort w=420000u l=150000u
-+  ad=1.864e+12p pd=1.682e+07u as=8.82e+10p ps=1.26e+06u
-M1002 a_1825_125# a_1273_393# VGND VNB nshort w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1003 a_2083_65# ASYNC a_2222_47# VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=1.344e+11p ps=1.7e+06u
-M1004 VGND a_2083_65# Q_N VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.25e+06u
-M1005 VPWR CLK a_761_357# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.591e+11p ps=3.09e+06u
-M1006 VGND a_2083_65# a_2035_91# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1007 a_2042_451# a_934_357# a_1903_125# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.856e+11p ps=2.47e+06u
-M1008 VPWR a_2083_65# a_2042_451# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1139_463# a_934_357# a_342_531# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=2.373e+11p ps=2.81e+06u
-M1010 a_1273_393# ASYNC a_1501_119# VNB nshort w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=1.536e+11p ps=1.76e+06u
-M1011 VPWR a_2083_65# Q_N VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.591e+11p ps=3.09e+06u
-M1012 a_312_47# a_75_531# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1013 a_342_531# D a_312_47# VNB nshort w=420000u l=150000u
-+  ad=2.583e+11p pd=2.91e+06u as=0p ps=0u
-M1014 Q a_2456_451# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1015 a_2083_65# a_1903_125# VPWR VPB phighvt w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1016 Q a_2456_451# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1017 a_1225_463# a_761_357# a_1139_463# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1018 a_1831_373# a_1273_393# VPWR VPB phighvt w=840000u l=150000u
-+  ad=3.276e+11p pd=2.76e+06u as=0p ps=0u
-M1019 VPWR a_1139_463# a_1273_393# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=4.788e+11p ps=4.5e+06u
-M1020 a_342_531# D a_264_531# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_2035_91# a_761_357# a_1903_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.515e+11p ps=2.64e+06u
-M1022 a_75_531# SCE VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1023 a_2456_451# a_2083_65# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1024 a_486_47# SCE a_342_531# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1025 VGND SCD a_486_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_2456_451# a_2083_65# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1027 a_1903_125# a_934_357# a_1825_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 VPWR SCD a_428_531# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.596e+11p ps=1.6e+06u
-M1029 a_934_357# a_761_357# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1030 a_428_531# a_75_531# a_342_531# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_636_531# a_342_531# VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1032 a_1139_463# a_761_357# a_342_531# VNB nshort w=420000u l=150000u
-+  ad=1.827e+11p pd=1.71e+06u as=0p ps=0u
-M1033 VPWR a_1273_393# a_1225_463# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1273_393# ASYNC VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 VPWR ASYNC a_2083_65# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_636_531# a_342_531# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1037 a_1319_119# a_934_357# a_1139_463# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1501_119# a_1139_463# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VGND CLK a_761_357# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.25e+06u
-M1040 a_2222_47# a_1903_125# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 VPWR SCE a_75_531# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1042 a_1903_125# a_761_357# a_1831_373# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_934_357# a_761_357# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
+X0 a_1225_463# a_1273_393# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_1831_373# a_761_357# a_1903_125# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 a_342_531# SCE a_486_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_1825_125# a_934_357# a_1903_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 a_264_531# D a_342_531# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 VGND a_761_357# a_934_357# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 Q_N a_2083_65# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_75_531# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VPWR a_342_531# a_636_531# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X9 VPWR a_1903_125# a_2083_65# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 a_761_357# CLK VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 VGND a_2083_65# a_2456_451# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VGND a_2456_451# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 VGND a_75_531# a_312_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VGND SCE a_75_531# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 VPWR a_1273_393# a_1831_373# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 a_761_357# CLK VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 a_1139_463# a_761_357# a_1225_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X18 a_1501_119# ASYNC a_1273_393# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 a_1139_463# a_934_357# a_1319_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_2083_65# ASYNC VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X21 VPWR SCE a_264_531# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X22 VPWR a_2083_65# a_2456_451# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X23 Q_N a_2083_65# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 a_2222_47# ASYNC a_2083_65# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X25 a_342_531# a_75_531# a_428_531# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X26 VPWR a_761_357# a_934_357# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 a_486_47# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 a_342_531# a_934_357# a_1139_463# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X29 a_1903_125# a_934_357# a_2042_451# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X30 VGND a_342_531# a_636_531# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 a_2042_451# a_2083_65# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X32 VGND a_1139_463# a_1501_119# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X33 VGND a_1273_393# a_1825_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X34 a_1273_393# a_1139_463# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X35 a_1319_119# a_1273_393# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X36 VPWR a_2456_451# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X37 a_1903_125# a_761_357# a_2035_91# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 a_428_531# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X39 a_312_47# D a_342_531# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X40 a_342_531# a_761_357# a_1139_463# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X41 VGND a_1903_125# a_2222_47# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X42 VPWR ASYNC a_1273_393# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X43 a_2035_91# a_2083_65# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.cdl b/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.cdl
index b16dff5..42f1c43 100644
--- a/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.cdl
+++ b/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.cdl
@@ -17,112 +17,112 @@
 .SUBCKT sky130_fd_sc_lp__srsdfrtn_1 CLK_N D RESET_B SCD SCE SLEEP_B KAPWR VGND VNB VPB VPWR Q
 *.PININFO CLK_N:I D:I RESET_B:I SCD:I SCE:I SLEEP_B:I KAPWR:I VGND:I
 *.PININFO VNB:I VPB:I VPWR:I Q:O
-MI683 net077 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
-MI688 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
-MI675 sleep SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI683 net077 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
-MI684 M1 M0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI688 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
+MI675 sleep SLEEP_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
+MI684 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
-MI642 clkpos CLK_N VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI642 clkpos CLK_N VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI636 clkneg clkpos VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI636 clkneg clkpos VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI674 net062 s0 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI674 net062 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
+MI690 net096 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 net0104 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
+MI657 net079 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 net069 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
-MI690 net096 clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI34 net0143 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
-MI42 net0104 clkneg VNB nshort 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
-MI657 net079 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI652 net041 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
-MI33 net069 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 Q net041 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-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 net0143 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 net041 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
-MI653 Q net041 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net0101 net062 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI654 net0101 net062 VNB nfet_01v8 m=1 w=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 net0110 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
-MI649 M1 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
-MI671 net0115 SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI647 net0110 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
-MI670 net0123 SLEEP_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
-MI676 net0102 SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI671 net0115 SLEEP_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
-MI681 net069 sleep VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI670 net0123 SLEEP_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
-MI666 net84 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI676 net0102 SLEEP_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
+MI681 net069 sleep VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI666 net84 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=0.64 l=0.15 mult=1 sa=0.265
+MI643 clkpos CLK_N 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
-MI687 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
-MI679 net062 RESET_B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI687 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 clkpos VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI679 net062 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
+MI635 clkneg 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
+MI43 net0220 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 net0212 net062 VPB pfet_01v8_hvt m=1 w=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
-MI43 net0220 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI658 net062 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
-MI662 net0212 net062 VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI30 net0156 M1 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
-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
-MI658 net062 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 net0156 M1 VPB phighvt 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
-MI31 M0 clkneg VPB phighvt 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
-MI32 M0 RESET_B VPB phighvt 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
-MI663 net041 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
-MI660 Q net041 VPB phighvt m=1 w=1.26 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.25 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=0.84 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
-MI672 clkpos SLEEP_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI31 M0 clkneg 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
-MI677 sleep SLEEP_B VPB phighvt m=1 w=1.0 l=0.25 mult=1 sa=0.265
+MI32 M0 RESET_B 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
-MI682 net0224 sleep VPB phighvt m=1 w=1.0 l=0.25 mult=1 sa=0.265
+MI663 net041 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
-MI689 net0133 clkpos VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI660 Q net041 VPB pfet_01v8_hvt m=1 w=1.26 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
+MI648 M1 M0 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
+MI650 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
+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
+MI672 clkpos SLEEP_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
+MI677 sleep SLEEP_B 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
+MI682 net0224 sleep 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
+MI689 net0133 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
+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
-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_lp__srsdfrtn_1
diff --git a/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.netlist.tsv b/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.netlist.tsv
index 32cc3fa..ca6b3d4 100644
--- a/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.netlist.tsv
+++ b/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.netlist.tsv
@@ -1,56 +1,56 @@
 sky130_fd_sc_lp__srsdfrtn_1	CLK_N:I D:I RESET_B:I SCD:I SCE:I SLEEP_B:I KAPWR: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
-MI683	MOSFET	net077	M1	net0143	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI688	MOSFET	db	clkneg	net0104	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	sleep	SLEEP_B	net0102	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI684	MOSFET	M1	M0	net0110	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	clkpos	CLK_N	net0123	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkneg	clkpos	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI674	MOSFET	net062	s0	net079	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI690	MOSFET	net096	clkneg	net0101	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI42	MOSFET	net0104	clkneg	M0	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net079	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net069	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	net077	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net0143	M1	net069	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net096	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net041	s0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net041	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net0101	net062	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	net0110	M0	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
-MI671	MOSFET	net0115	SLEEP_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net0123	SLEEP_B	net0115	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI676	MOSFET	net0102	SLEEP_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI681	MOSFET	net069	sleep	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	net84	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	net84	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	net84	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	clkpos	CLK_N	KAPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI687	MOSFET	db	clkpos	net0220	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI679	MOSFET	net062	RESET_B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkneg	clkpos	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI43	MOSFET	net0220	clkpos	M0	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI662	MOSFET	net0212	net062	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net0133	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net062	s0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net0156	M1	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI31	MOSFET	M0	clkneg	net0156	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI32	MOSFET	M0	RESET_B	net0224	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net041	s0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net041	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	s0	VPB	phighvt	1	0.84	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
-MI672	MOSFET	clkpos	SLEEP_B	KAPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	sleep	SLEEP_B	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI682	MOSFET	net0224	sleep	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI689	MOSFET	net0133	clkpos	net0212	VPB	phighvt	1	0.42	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
+MI683	MOSFET	net077	M1	net0143	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI688	MOSFET	db	clkneg	net0104	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI675	MOSFET	sleep	SLEEP_B	net0102	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI684	MOSFET	M1	M0	net0110	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkpos	CLK_N	net0123	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkneg	clkpos	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI674	MOSFET	net062	s0	net079	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI690	MOSFET	net096	clkneg	net0101	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI42	MOSFET	net0104	clkneg	M0	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net079	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	net069	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	net077	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net0143	M1	net069	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net096	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net041	s0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net041	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net0101	net062	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	net0110	M0	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
+MI671	MOSFET	net0115	SLEEP_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net0123	SLEEP_B	net0115	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI676	MOSFET	net0102	SLEEP_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI681	MOSFET	net069	sleep	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	net84	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	net84	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	net84	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	KAPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI687	MOSFET	db	clkpos	net0220	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI679	MOSFET	net062	RESET_B	VPWR	VPB	pfet_01v8_hvt	1	0.42	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI43	MOSFET	net0220	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	net0212	net062	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	net0133	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net062	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	net0156	M1	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI31	MOSFET	M0	clkneg	net0156	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI32	MOSFET	M0	RESET_B	net0224	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net041	s0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net041	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	M1	M0	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	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
+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
+MI672	MOSFET	clkpos	SLEEP_B	KAPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	sleep	SLEEP_B	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI682	MOSFET	net0224	sleep	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI689	MOSFET	net0133	clkpos	net0212	VPB	pfet_01v8_hvt	1	0.42	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/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.spice b/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.spice
index f567dbb..7a848b2 100644
--- a/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.spice
+++ b/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.spice
@@ -17,112 +17,58 @@
 
 .subckt sky130_fd_sc_lp__srsdfrtn_1 CLK_N D RESET_B SCD SCE SLEEP_B KAPWR VGND VNB
 + VPB VPWR Q
-M1000 a_1041_419# a_742_63# a_305_97# VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=4.078e+11p ps=3.91e+06u
-M1001 VGND SCE a_27_55# VNB nshort w=420000u l=150000u
-+  ad=1.322e+12p pd=1.296e+07u as=1.155e+11p ps=1.39e+06u
-M1002 a_2951_99# a_666_89# a_2879_99# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=8.82e+10p ps=1.26e+06u
-M1003 a_469_97# a_27_55# a_391_97# VNB nshort w=420000u l=150000u
-+  ad=2.373e+11p pd=2.81e+06u as=1.008e+11p ps=1.32e+06u
-M1004 a_411_491# a_27_55# a_305_97# VPB phighvt w=640000u l=150000u
-+  ad=3.136e+11p pd=2.26e+06u as=0p ps=0u
-M1005 a_2999_73# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.4703e+12p ps=1.248e+07u
-M1006 a_2480_97# SLEEP_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1007 a_1453_77# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=2.331e+11p pd=2.79e+06u as=0p ps=0u
-M1008 a_3115_99# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1009 a_2999_73# a_2717_427# a_3115_99# VNB nshort w=420000u l=150000u
-+  ad=1.68e+11p pd=1.64e+06u as=0p ps=0u
-M1010 KAPWR a_1343_51# a_1242_419# VPB phighvt w=1e+06u l=250000u
-+  ad=1.68302e+12p pd=1.137e+07u as=5.15e+11p ps=3.03e+06u
-M1011 a_1682_341# RESET_B a_1113_419# VPB phighvt w=1e+06u l=250000u
-+  ad=2.1e+11p pd=2.42e+06u as=5.962e+11p ps=5.32e+06u
-M1012 a_1373_77# a_1343_51# a_1009_107# VNB nshort w=420000u l=150000u
-+  ad=1.05e+11p pd=1.34e+06u as=4.293e+11p ps=4.11e+06u
-M1013 a_2879_99# a_666_89# a_2717_427# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.51e+11p ps=2.14e+06u
-M1014 KAPWR a_1724_21# a_1682_341# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_1343_51# a_666_89# a_2717_427# VPB phighvt w=840000u l=150000u
-+  ad=8.3315e+11p pd=5.66e+06u as=2.688e+11p ps=2.43e+06u
-M1016 VPWR SCE a_27_55# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1017 a_1724_21# SLEEP_B KAPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.65e+11p pd=2.53e+06u as=0p ps=0u
-M1018 VGND a_742_63# a_666_89# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.513e+11p ps=3.02e+06u
-M1019 KAPWR SLEEP_B a_742_63# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1020 a_1724_21# SLEEP_B a_2480_97# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1021 VPWR a_742_63# a_666_89# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1022 a_220_97# SCD a_469_97# VNB nshort w=420000u l=150000u
-+  ad=2.352e+11p pd=2.8e+06u as=0p ps=0u
-M1023 a_305_97# SCE a_220_97# VNB nshort w=420000u l=150000u
-+  ad=2.331e+11p pd=2.79e+06u as=0p ps=0u
-M1024 Q a_3368_57# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.465e+11p pd=3.07e+06u as=0p ps=0u
-M1025 a_247_491# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1026 a_305_97# D a_247_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND a_1724_21# a_1453_77# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_469_97# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_1343_51# a_1113_419# KAPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 a_2717_427# a_742_63# a_2645_427# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1031 VPWR a_2999_73# a_2562_427# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=2.31e+11p ps=2.78e+06u
-M1032 a_1343_51# a_1113_419# a_1840_47# VNB nshort w=420000u l=150000u
-+  ad=3.245e+11p pd=3.33e+06u as=8.82e+10p ps=1.26e+06u
-M1033 Q a_3368_57# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1034 a_305_97# a_666_89# a_1201_215# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1035 a_1453_77# a_1343_51# a_1373_77# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VGND a_2717_427# a_3368_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1037 a_1113_419# a_742_63# a_1041_419# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_2198_97# CLK_N a_742_63# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=2.666e+11p ps=2.32e+06u
-M1039 a_2276_97# SLEEP_B a_2198_97# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1040 a_391_97# D a_305_97# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_1113_419# a_742_63# a_1009_107# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1042 a_742_63# CLK_N KAPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 VGND SLEEP_B a_2276_97# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_2717_427# a_742_63# a_1343_51# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_1201_215# a_666_89# a_1113_419# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 VPWR a_2717_427# a_2999_73# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VPWR a_2717_427# a_3368_57# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.76e+11p ps=1.83e+06u
-M1048 a_1840_47# a_1113_419# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 a_305_97# RESET_B VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 a_2645_427# a_742_63# a_2562_427# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 VGND a_2999_73# a_2951_99# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1052 VPWR SCD a_411_491# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1053 a_1242_419# a_666_89# a_1113_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR SCE a_247_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_411_491# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_1373_77# a_1343_51# a_1453_77# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 VPWR a_3368_57# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 KAPWR CLK_N a_742_63# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_2562_427# a_742_63# a_2645_427# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X6 a_2562_427# a_2999_73# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X7 VGND SLEEP_B a_2480_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_247_491# D a_305_97# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 a_2198_97# SLEEP_B a_2276_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_3115_99# a_2717_427# a_2999_73# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND a_3368_57# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 a_1682_341# a_1724_21# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X13 a_2717_427# a_666_89# a_1343_51# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 a_391_97# a_27_55# a_469_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_2717_427# a_666_89# a_2879_99# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 VGND RESET_B a_469_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_469_97# SCD a_220_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_2999_73# a_2717_427# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X19 a_666_89# a_742_63# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X20 a_220_97# SCE a_305_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_742_63# SLEEP_B KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 VPWR RESET_B a_2999_73# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X23 a_305_97# a_27_55# a_411_491# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X24 a_305_97# a_742_63# a_1041_419# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X25 a_305_97# D a_391_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_666_89# a_742_63# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_3368_57# a_2717_427# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 KAPWR a_1113_419# a_1343_51# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X29 a_27_55# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_742_63# CLK_N a_2198_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X31 VGND RESET_B a_1453_77# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 VGND RESET_B a_3115_99# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X33 a_3368_57# a_2717_427# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X34 a_1453_77# a_1724_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 a_1242_419# a_1343_51# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X36 a_2645_427# a_742_63# a_2717_427# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X37 VGND a_1113_419# a_1840_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 a_1009_107# a_742_63# a_1113_419# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 a_1113_419# RESET_B a_1682_341# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X40 a_1343_51# a_742_63# a_2717_427# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X41 a_2879_99# a_666_89# a_2951_99# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X42 a_1840_47# a_1113_419# a_1343_51# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X43 VPWR RESET_B a_305_97# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X44 a_1201_215# a_666_89# a_305_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X45 a_2276_97# SLEEP_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X46 a_27_55# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X47 a_1113_419# a_666_89# a_1242_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X48 a_1041_419# a_742_63# a_1113_419# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X49 a_1113_419# a_666_89# a_1201_215# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X50 a_2480_97# SLEEP_B a_1724_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X51 KAPWR SLEEP_B a_1724_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X52 a_2951_99# a_2999_73# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X53 a_1009_107# a_1343_51# a_1373_77# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.cdl b/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.cdl
index 4efd105..0e22f9e 100644
--- a/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.cdl
+++ b/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.cdl
@@ -17,108 +17,108 @@
 .SUBCKT sky130_fd_sc_lp__srsdfrtp_1 CLK D RESET_B SCD SCE SLEEP_B KAPWR VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I RESET_B:I SCD:I SCE:I SLEEP_B:I KAPWR:I VGND:I
 *.PININFO VNB:I VPB:I VPWR:I Q:O
-MI673 net061 net062 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI673 net061 net062 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI675 sleep SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI675 sleep SLEEP_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
-MI642 clkneg CLK VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI674 net062 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
-MI678 net048 sleep 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.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
-MI656 net079 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 net048 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI674 net062 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
-MI33 net069 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI678 net048 sleep VNB nfet_01v8 m=1 w=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 net077 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 net041 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
-MI653 Q net041 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net096 net062 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
-MI647 M1 M0 VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 net079 s0 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI657 net048 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 net069 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 net084 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI34 net077 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
-MI671 net0115 SLEEP_B VNB nshort 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
-MI670 net0123 SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI652 net041 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
-MI676 net0102 SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI653 Q net041 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI682 M1 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI654 net096 net062 VNB nfet_01v8 m=1 w=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 net84 RESET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI649 net084 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
+MI671 net0115 SLEEP_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
+MI670 net0123 SLEEP_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 net0102 SLEEP_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
+MI682 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 net84 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=0.64 l=0.15 mult=1 sa=0.265
+MI643 clkneg CLK 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
-MI681 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
-MI679 net062 RESET_B VPB phighvt m=1 w=1.0 l=0.25 mult=1 sa=0.265
+MI681 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
-MI635 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI679 net062 RESET_B 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
+MI635 clkpos clkneg 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
+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
-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 net0133 net062 VPB phighvt m=1 w=1.0 l=0.25 mult=1 sa=0.265
+MI662 net0133 net062 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
+MI664 s0 clkpos 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
-MI664 s0 clkpos VPB phighvt 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
-MI658 net062 s0 VPB phighvt 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
-MI30 net0156 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 net041 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
-MI660 Q net041 VPB phighvt m=1 w=1.26 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=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 net0217 clkneg VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI658 net062 s0 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
-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
-MI672 clkneg SLEEP_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI30 net0156 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
-MI680 net0198 sleep VPB phighvt m=1 w=1.0 l=0.25 mult=1 sa=0.265
+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
-MI677 sleep SLEEP_B VPB phighvt m=1 w=1.0 l=0.25 mult=1 sa=0.265
+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
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+MI663 net041 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
+MI660 Q net041 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 net0217 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
+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
+MI672 clkneg SLEEP_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
+MI680 net0198 sleep 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
+MI677 sleep SLEEP_B 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
+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
-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_lp__srsdfrtp_1
diff --git a/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.netlist.tsv b/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.netlist.tsv
index f6e5429..ce2d23f 100644
--- a/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.netlist.tsv
+++ b/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.netlist.tsv
@@ -1,54 +1,54 @@
 sky130_fd_sc_lp__srsdfrtp_1	CLK:I D:I RESET_B:I SCD:I SCE:I SLEEP_B:I KAPWR: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
-MI673	MOSFET	net061	net062	net096	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	sleep	SLEEP_B	net0102	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	clkneg	CLK	net0123	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI674	MOSFET	net062	s0	net079	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI678	MOSFET	net048	sleep	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
-MI656	MOSFET	net079	s0	net048	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI657	MOSFET	net048	RESET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	net069	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	net077	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net077	M1	net069	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI655	MOSFET	s0	clkneg	net061	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net041	s0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net041	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net096	net062	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	net084	clkpos	s0	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI671	MOSFET	net0115	SLEEP_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net0123	SLEEP_B	net0115	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI676	MOSFET	net0102	SLEEP_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI682	MOSFET	M1	clkpos	net084	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI666	MOSFET	net84	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	net84	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	net84	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
-MI643	MOSFET	clkneg	CLK	KAPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI681	MOSFET	M1	clkneg	net0217	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI679	MOSFET	net062	RESET_B	net0198	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	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	net0133	net062	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net0133	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net062	s0	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net0156	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	net0156	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	net041	s0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net041	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	net0217	clkneg	s0	VPB	phighvt	1	0.84	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
-MI672	MOSFET	clkneg	SLEEP_B	KAPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI680	MOSFET	net0198	sleep	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	sleep	SLEEP_B	KAPWR	VPB	phighvt	1	1.0	0.25	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
+MI673	MOSFET	net061	net062	net096	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI675	MOSFET	sleep	SLEEP_B	net0102	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkneg	CLK	net0123	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI674	MOSFET	net062	s0	net079	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI678	MOSFET	net048	sleep	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
+MI656	MOSFET	net079	s0	net048	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI657	MOSFET	net048	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	net069	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	net077	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net077	M1	net069	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI655	MOSFET	s0	clkneg	net061	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net041	s0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net041	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net096	net062	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	net084	clkpos	s0	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI671	MOSFET	net0115	SLEEP_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net0123	SLEEP_B	net0115	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI676	MOSFET	net0102	SLEEP_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI682	MOSFET	M1	clkpos	net084	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI666	MOSFET	net84	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	net84	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	net84	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.525	3.1
+MI643	MOSFET	clkneg	CLK	KAPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI681	MOSFET	M1	clkneg	net0217	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI679	MOSFET	net062	RESET_B	net0198	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI635	MOSFET	clkpos	clkneg	VPWR	VPB	pfet_01v8_hvt	1	0.64	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	net0133	net062	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net0133	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net062	s0	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net0156	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	net0156	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	net041	s0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net041	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	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
+MI650	MOSFET	net0217	clkneg	s0	VPB	pfet_01v8_hvt	1	0.84	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
+MI672	MOSFET	clkneg	SLEEP_B	KAPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI680	MOSFET	net0198	sleep	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	sleep	SLEEP_B	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	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/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.spice b/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.spice
index aac9636..74978d8 100644
--- a/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.spice
+++ b/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.spice
@@ -17,108 +17,56 @@
 
 .subckt sky130_fd_sc_lp__srsdfrtp_1 CLK D RESET_B SCD SCE SLEEP_B KAPWR VGND VNB VPB
 + VPWR Q
-M1000 a_999_424# a_969_318# a_332_136# VPB phighvt w=420000u l=150000u
-+  ad=4.252e+11p pd=3.81e+06u as=6.772e+11p ps=5.08e+06u
-M1001 VPWR a_999_424# a_1176_349# VPB phighvt w=840000u l=150000u
-+  ad=2.596e+12p pd=1.588e+07u as=4.788e+11p ps=4.5e+06u
-M1002 VGND a_2176_99# a_2206_125# VNB nshort w=420000u l=150000u
-+  ad=1.38275e+12p pd=1.474e+07u as=8.82e+10p ps=1.26e+06u
-M1003 VGND SCE a_27_110# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
-M1004 a_1128_424# a_1098_271# a_999_424# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1005 a_2836_390# a_969_318# a_1982_397# VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=5.244e+11p ps=4.82e+06u
-M1006 a_2472_119# a_1982_397# a_2176_99# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.155e+11p ps=1.39e+06u
-M1007 a_2544_119# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=2.373e+11p pd=2.81e+06u as=0p ps=0u
-M1008 a_552_466# a_27_110# a_332_136# VPB phighvt w=640000u l=150000u
-+  ad=2.304e+11p pd=2e+06u as=0p ps=0u
-M1009 VPWR SCD a_552_466# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_534_136# a_27_110# a_462_136# VNB nshort w=420000u l=150000u
-+  ad=2.331e+11p pd=2.79e+06u as=8.82e+10p ps=1.26e+06u
-M1011 a_2206_125# a_2176_99# a_2134_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1012 a_3694_73# SLEEP_B a_2586_249# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.155e+11p ps=1.39e+06u
-M1013 a_969_318# a_1098_271# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1014 VGND SLEEP_B a_3694_73# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 KAPWR a_1982_397# a_2176_99# VPB phighvt w=1e+06u l=250000u
-+  ad=1.23675e+12p pd=8.71e+06u as=2.8e+11p ps=2.56e+06u
-M1016 Q a_3751_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1017 a_313_466# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=0p ps=0u
-M1018 a_2134_125# a_1098_271# a_1982_397# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.99e+11p ps=2.29e+06u
-M1019 a_220_136# SCD a_534_136# VNB nshort w=420000u l=150000u
-+  ad=2.877e+11p pd=3.05e+06u as=0p ps=0u
-M1020 VPWR a_1176_349# a_1128_424# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_462_136# D a_332_136# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.64e+11p ps=3.51e+06u
-M1022 KAPWR a_2176_99# a_2836_390# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_534_136# RESET_B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1098_271# CLK KAPWR VPB phighvt w=640000u l=150000u
-+  ad=1.984e+11p pd=1.9e+06u as=0p ps=0u
-M1025 a_2586_249# SLEEP_B KAPWR VPB phighvt w=1e+06u l=250000u
-+  ad=4.232e+11p pd=2.96e+06u as=0p ps=0u
-M1026 a_1982_397# a_969_318# a_1931_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=1.344e+11p ps=1.7e+06u
-M1027 KAPWR SLEEP_B a_1098_271# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_3407_97# SLEEP_B a_3335_97# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=8.82e+10p ps=1.26e+06u
-M1029 a_969_318# a_1098_271# VGND VNB nshort w=420000u l=150000u
-+  ad=2.703e+11p pd=2.42e+06u as=0p ps=0u
-M1030 VGND SLEEP_B a_3407_97# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_3751_367# a_1982_397# VGND VNB nshort w=420000u l=150000u
-+  ad=1.155e+11p pd=1.39e+06u as=0p ps=0u
-M1032 a_332_136# a_1098_271# a_999_424# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.47e+11p ps=1.54e+06u
-M1033 a_999_424# a_969_318# a_929_152# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=3.248e+11p ps=3.27e+06u
-M1034 VPWR SCE a_27_110# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1035 a_1931_125# a_969_318# a_1176_349# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=3.52e+11p ps=3.66e+06u
-M1036 a_3063_390# a_2586_249# KAPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.1e+11p pd=2.42e+06u as=0p ps=0u
-M1037 a_2069_397# a_1098_271# a_1982_397# VPB phighvt w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=0p ps=0u
-M1038 a_1176_349# a_1098_271# a_2069_397# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_332_136# D a_313_466# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_332_136# SCE a_220_136# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_2176_99# RESET_B a_3063_390# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1042 VGND RESET_B a_1343_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1043 a_999_424# RESET_B VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_2544_119# a_1982_397# a_2472_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_332_136# RESET_B VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1046 VGND a_999_424# a_1176_349# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1047 VGND a_2586_249# a_2544_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 a_3335_97# CLK a_1098_271# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.68e+11p ps=1.64e+06u
-M1049 Q a_3751_367# VGND VNB nshort w=840000u l=150000u
-+  ad=2.31e+11p pd=2.23e+06u as=0p ps=0u
-M1050 a_1343_119# a_1176_349# a_929_152# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 VPWR a_1982_397# a_3751_367# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
+X0 a_220_136# SCE a_332_136# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_1098_271# CLK a_3335_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_1128_424# a_1176_349# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 a_462_136# a_27_110# a_534_136# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_3063_390# RESET_B a_2176_99# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 a_929_152# a_1176_349# a_1343_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_3335_97# SLEEP_B a_3407_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VPWR RESET_B a_999_424# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 VGND RESET_B a_534_136# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_2069_397# a_1098_271# a_1176_349# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 a_1931_125# a_969_318# a_1982_397# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X11 a_2472_119# a_1982_397# a_2544_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 VPWR SCE a_313_466# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X13 a_332_136# a_27_110# a_552_466# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X14 a_332_136# a_969_318# a_999_424# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X15 a_332_136# D a_462_136# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X16 a_27_110# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 KAPWR CLK a_1098_271# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 VPWR a_1098_271# a_969_318# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 a_2176_99# a_1982_397# a_2472_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_1176_349# a_999_424# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 a_3751_367# a_1982_397# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X22 a_3694_73# SLEEP_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_999_424# a_1098_271# a_1128_424# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X24 a_1343_119# RESET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 VGND a_1982_397# a_3751_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_929_152# a_969_318# a_999_424# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 KAPWR a_2586_249# a_3063_390# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X28 a_2544_119# a_2586_249# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_1982_397# a_1098_271# a_2134_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 a_1982_397# a_969_318# a_2836_390# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X31 KAPWR SLEEP_B a_2586_249# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X32 a_552_466# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X33 a_1176_349# a_999_424# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X34 a_2206_125# a_2176_99# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 a_2836_390# a_2176_99# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X36 a_999_424# a_1098_271# a_332_136# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 VGND a_1098_271# a_969_318# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 a_3407_97# SLEEP_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X39 VGND a_3751_367# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X40 a_2586_249# SLEEP_B a_3694_73# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X41 VGND RESET_B a_2544_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X42 a_313_466# D a_332_136# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X43 a_2134_125# a_2176_99# a_2206_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X44 a_534_136# SCD a_220_136# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X45 a_2176_99# a_1982_397# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X46 VPWR a_3751_367# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X47 VPWR RESET_B a_332_136# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X48 a_1982_397# a_1098_271# a_2069_397# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X49 a_1176_349# a_969_318# a_1931_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X50 a_1098_271# SLEEP_B KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X51 a_27_110# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.cdl b/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.cdl
index ab4b79b..cb41dd2 100644
--- a/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.cdl
+++ b/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.cdl
@@ -17,108 +17,108 @@
 .SUBCKT sky130_fd_sc_lp__srsdfstp_1 CLK D SCD SCE SET_B SLEEP_B KAPWR VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I SET_B:I SLEEP_B:I KAPWR:I VGND:I VNB:I
 *.PININFO VPB:I VPWR:I Q:O
-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
-MI684 net160 sleep VPB phighvt m=1 w=1.0 l=0.25 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
-MI663 net204 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
-MI660 Q net204 VPB phighvt m=1 w=1.26 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 net144 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 net131 S1 VPB phighvt 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
-MI669 S0 clkpos VPB phighvt 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
-MI674 clkneg SLEEP_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI684 net160 sleep 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
-MI648 S1 S0 VPB phighvt 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
-MI37 net228 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
-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
-MI681 sleep SLEEP_B VPB phighvt m=1 w=1.0 l=0.25 mult=1 sa=0.265
+MI663 net204 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
-MI643 clkneg CLK VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI660 Q net204 VPB pfet_01v8_hvt m=1 w=1.26 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=0.64 l=0.15 mult=1 sa=0.265
+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
-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
-MI685 S0 SET_B VPB phighvt 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
-MI687 net87 clkneg VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI662 net144 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
-MI686 net228 clkneg VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=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
-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
-MI680 net243 SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI6 net131 S1 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
-MI670 net191 SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI669 S0 clkpos 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
-MI27 net268 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
-MI678 net260 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
-MI683 net248 sleep VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI674 clkneg SLEEP_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
+MI648 S1 S0 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
-MI682 net248 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI37 net228 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
-MI679 sleep SLEEP_B VNB nshort 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
-MI677 net240 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
-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 net255 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 net228 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
-MI636 clkpos clkneg VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI681 sleep SLEEP_B 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
-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
-MI657 net208 SET_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI643 clkneg CLK 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 net204 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
-MI673 net200 SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg 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
+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
-MI653 Q net204 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI642 clkneg CLK VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI689 net188 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI685 S0 SET_B 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
-MI688 net228 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI687 net87 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
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI686 net228 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
+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
+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 net243 SLEEP_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
+MI670 net191 SLEEP_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
+MI27 net268 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
+MI678 net260 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
+MI683 net248 sleep VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI682 net248 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
+MI679 sleep SLEEP_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
+MI677 net240 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
+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 net255 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 net228 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
+MI636 clkpos clkneg VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+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
+MI657 net208 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 net204 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
+MI673 net200 SLEEP_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 net204 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI642 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI689 net188 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
+MI688 net228 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
+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_lp__srsdfstp_1
diff --git a/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.netlist.tsv b/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.netlist.tsv
index 33a4a9b..3d53658 100644
--- a/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.netlist.tsv
+++ b/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.netlist.tsv
@@ -1,54 +1,54 @@
 sky130_fd_sc_lp__srsdfstp_1	CLK:I D:I SCD:I SCE:I SET_B:I SLEEP_B:I KAPWR: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
-MI658	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI684	MOSFET	net160	sleep	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net204	S0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net204	VPWR	VPB	phighvt	1	1.26	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	net144	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	net144	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	net131	S1	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI669	MOSFET	S0	clkpos	net131	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI674	MOSFET	clkneg	SLEEP_B	KAPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	S1	S0	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net228	M0	VPWR	VPB	phighvt	1	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
-MI681	MOSFET	sleep	SLEEP_B	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI643	MOSFET	clkneg	CLK	KAPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	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
-MI685	MOSFET	S0	SET_B	net160	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI687	MOSFET	net87	clkneg	S0	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI686	MOSFET	net228	clkneg	net87	VPB	phighvt	1	0.84	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
-MI680	MOSFET	net243	SLEEP_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net191	SLEEP_B	net200	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	net268	S1	net240	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI647	MOSFET	S1	S0	net260	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI678	MOSFET	net260	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	net255	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI683	MOSFET	net248	sleep	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI682	MOSFET	net248	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI679	MOSFET	sleep	SLEEP_B	net243	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI677	MOSFET	net240	S1	net248	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI656	MOSFET	M1	M0	net208	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net255	M1	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net228	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	net268	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
-MI636	MOSFET	clkpos	clkneg	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
-MI657	MOSFET	net208	SET_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net204	S0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI673	MOSFET	net200	SLEEP_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net204	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	clkneg	CLK	net191	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI689	MOSFET	net188	clkpos	S0	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI688	MOSFET	net228	clkpos	net188	VNB	nshort	1	0.64	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
+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
+MI684	MOSFET	net160	sleep	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net204	S0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net204	VPWR	VPB	pfet_01v8_hvt	1	1.26	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	net144	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	net144	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	net131	S1	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI669	MOSFET	S0	clkpos	net131	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI674	MOSFET	clkneg	SLEEP_B	KAPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	MOSFET	S1	S0	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net228	M0	VPWR	VPB	pfet_01v8_hvt	1	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
+MI681	MOSFET	sleep	SLEEP_B	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI643	MOSFET	clkneg	CLK	KAPWR	VPB	pfet_01v8_hvt	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.64	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
+MI685	MOSFET	S0	SET_B	net160	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI687	MOSFET	net87	clkneg	S0	VPB	pfet_01v8_hvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI686	MOSFET	net228	clkneg	net87	VPB	pfet_01v8_hvt	1	0.84	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
+MI680	MOSFET	net243	SLEEP_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net191	SLEEP_B	net200	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	net268	S1	net240	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI647	MOSFET	S1	S0	net260	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI678	MOSFET	net260	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	net255	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI683	MOSFET	net248	sleep	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI682	MOSFET	net248	SET_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI679	MOSFET	sleep	SLEEP_B	net243	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI677	MOSFET	net240	S1	net248	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI656	MOSFET	M1	M0	net208	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net255	M1	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net228	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	net268	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
+MI636	MOSFET	clkpos	clkneg	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
+MI657	MOSFET	net208	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	net204	S0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI673	MOSFET	net200	SLEEP_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	net204	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkneg	CLK	net191	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI689	MOSFET	net188	clkpos	S0	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI688	MOSFET	net228	clkpos	net188	VNB	nfet_01v8	1	0.64	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/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.spice b/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.spice
index b0c34d5..aecff8d 100644
--- a/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.spice
+++ b/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.spice
@@ -17,108 +17,56 @@
 
 .subckt sky130_fd_sc_lp__srsdfstp_1 CLK D SCD SCE SET_B SLEEP_B KAPWR VGND VNB VPB
 + VPWR Q
-M1000 VPWR SCD a_27_481# VPB phighvt w=640000u l=150000u
-+  ad=1.6054e+12p pd=1.277e+07u as=3.456e+11p ps=3.64e+06u
-M1001 a_111_119# SCD VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.5248e+12p ps=1.521e+07u
-M1002 VGND a_1068_21# a_996_73# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.694e+11p ps=1.82e+06u
-M1003 VGND SET_B a_1336_97# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.029e+11p ps=1.33e+06u
-M1004 Q a_3466_403# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.465e+11p pd=3.07e+06u as=0p ps=0u
-M1005 a_887_139# a_689_139# a_189_119# VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=3.283e+11p ps=3.39e+06u
-M1006 a_2074_125# a_1972_99# a_2002_125# VNB nshort w=420000u l=150000u
-+  ad=2.331e+11p pd=2.79e+06u as=8.82e+10p ps=1.26e+06u
-M1007 VGND a_1728_125# a_3466_403# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.134e+11p ps=1.38e+06u
-M1008 VGND SET_B a_2074_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_1068_21# a_887_139# VPWR VPB phighvt w=420000u l=150000u
-+  ad=2.541e+11p pd=2.47e+06u as=0p ps=0u
-M1010 a_689_139# a_659_113# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1011 KAPWR a_1972_99# a_2862_414# VPB phighvt w=1e+06u l=250000u
-+  ad=1.30002e+12p pd=9.18e+06u as=2.7e+11p ps=2.54e+06u
-M1012 a_189_119# D a_213_481# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.536e+11p ps=1.76e+06u
-M1013 a_189_119# SCE a_111_119# VNB nshort w=420000u l=150000u
-+  ad=2.373e+11p pd=2.81e+06u as=0p ps=0u
-M1014 a_3134_72# SLEEP_B a_3056_72# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.008e+11p ps=1.32e+06u
-M1015 a_3056_72# CLK a_659_113# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.8105e+11p ps=1.73e+06u
-M1016 a_275_119# D a_189_119# VNB nshort w=420000u l=150000u
-+  ad=1.344e+11p pd=1.48e+06u as=0p ps=0u
-M1017 a_1728_125# a_689_139# a_1656_125# VNB nshort w=640000u l=150000u
-+  ad=5.339e+11p pd=3e+06u as=1.344e+11p ps=1.7e+06u
-M1018 KAPWR a_1728_125# a_1972_99# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=8.55e+11p ps=3.71e+06u
-M1019 VPWR a_1728_125# a_3466_403# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1020 a_3292_72# SLEEP_B VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1021 a_2862_414# a_689_139# a_1728_125# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=5.194e+11p ps=4.81e+06u
-M1022 a_2216_99# SLEEP_B a_3292_72# VNB nshort w=420000u l=150000u
-+  ad=1.134e+11p pd=1.38e+06u as=0p ps=0u
-M1023 VGND a_339_93# a_275_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_2658_414# a_2216_99# KAPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=0p ps=0u
-M1025 a_1656_125# a_689_139# a_1541_125# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.72e+11p ps=2.13e+06u
-M1026 KAPWR SLEEP_B a_659_113# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.792e+11p ps=1.84e+06u
-M1027 VPWR SET_B a_1068_21# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_689_139# a_659_113# VGND VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1029 VGND SCE a_339_93# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1030 a_1712_451# a_659_113# a_1541_125# VPB phighvt w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=5.922e+11p ps=3.09e+06u
-M1031 a_996_73# a_689_139# a_887_139# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.2695e+11p ps=2.29e+06u
-M1032 a_1541_125# a_887_139# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Q a_3466_403# VGND VNB nshort w=840000u l=150000u
-+  ad=2.268e+11p pd=2.22e+06u as=0p ps=0u
-M1034 a_1132_535# a_659_113# a_887_139# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1035 VPWR a_1068_21# a_1132_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR SCE a_339_93# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.728e+11p ps=1.82e+06u
-M1037 a_1728_125# a_659_113# a_1712_451# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1336_97# a_887_139# a_1068_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1039 a_659_113# CLK KAPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 a_1541_125# a_887_139# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1041 a_1972_99# a_1728_125# a_2463_119# VNB nshort w=420000u l=150000u
-+  ad=2.282e+11p pd=2.08e+06u as=8.82e+10p ps=1.26e+06u
-M1042 a_213_481# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1043 a_1728_125# SET_B a_2658_414# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1044 a_2074_125# a_2216_99# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1045 a_2216_99# SLEEP_B KAPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1046 a_2002_125# a_1972_99# a_1930_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1047 a_887_139# a_659_113# a_189_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1048 a_27_481# a_339_93# a_189_119# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1049 VGND SLEEP_B a_3134_72# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1050 a_1930_125# a_659_113# a_1728_125# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1051 a_2463_119# a_1728_125# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1656_125# a_689_139# a_1728_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X1 a_2002_125# a_1972_99# a_2074_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_3466_403# a_1728_125# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_3466_403# a_1728_125# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VGND a_2216_99# a_2074_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VPWR a_3466_403# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_3056_72# SLEEP_B a_3134_72# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_27_481# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 a_1336_97# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_1728_125# a_659_113# a_1930_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_887_139# a_659_113# a_1132_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X11 VGND a_659_113# a_689_139# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_3134_72# SLEEP_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_1132_535# a_1068_21# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X14 VGND SLEEP_B a_3292_72# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_1728_125# a_689_139# a_2862_414# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X16 a_2074_125# SET_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VPWR SCE a_213_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 a_1068_21# a_887_139# a_1336_97# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 KAPWR a_2216_99# a_2658_414# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X20 a_1541_125# a_659_113# a_1712_451# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X21 a_1712_451# a_659_113# a_1728_125# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X22 a_2463_119# a_1728_125# a_1972_99# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 VGND a_3466_403# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 a_1930_125# a_1972_99# a_2002_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 a_2658_414# SET_B a_1728_125# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X26 a_659_113# CLK a_3056_72# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_887_139# a_689_139# a_996_73# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X28 VGND a_1728_125# a_2463_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_111_119# SCE a_189_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X30 VPWR a_887_139# a_1541_125# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X31 a_1541_125# a_689_139# a_1656_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X32 a_2862_414# a_1972_99# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X33 a_1068_21# SET_B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X34 a_275_119# a_339_93# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 VGND a_887_139# a_1541_125# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X36 a_1972_99# a_1728_125# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X37 KAPWR SLEEP_B a_2216_99# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X38 VPWR a_659_113# a_689_139# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X39 VGND SCD a_111_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X40 VPWR a_887_139# a_1068_21# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X41 a_3292_72# SLEEP_B a_2216_99# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X42 a_189_119# a_339_93# a_27_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X43 a_189_119# a_689_139# a_887_139# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X44 a_996_73# a_1068_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X45 KAPWR CLK a_659_113# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X46 a_659_113# SLEEP_B KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X47 a_213_481# D a_189_119# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X48 a_339_93# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X49 a_189_119# D a_275_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X50 a_339_93# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X51 a_189_119# a_659_113# a_887_139# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.cdl b/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.cdl
index c7a1edc..3cde123 100644
--- a/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.cdl
+++ b/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.cdl
@@ -17,86 +17,86 @@
 .SUBCKT sky130_fd_sc_lp__srsdfxtp_1 CLK D SCD SCE SLEEP_B KAPWR VGND VNB VPB VPWR Q
 *.PININFO CLK:I D:I SCD:I SCE:I SLEEP_B:I KAPWR:I VGND:I VNB:I VPB:I
 *.PININFO VPWR:I Q:O
-MI676 net085 clkpos VNB nshort m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI676 net085 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
-MI673 net061 net062 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI673 net061 net062 VNB nfet_01v8 m=1 w=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 clkneg CLK VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MI642 clkneg CLK VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MI674 net062 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
-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 net079 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
-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 net077 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 net041 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
-MI653 Q net041 VNB nshort m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI654 net096 net062 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.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
-+ 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
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MI671 net0115 SLEEP_B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MI674 net062 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
-MI670 net0123 SLEEP_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
-MI98 db D VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI656 net079 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 nfet_01v8 m=1 w=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
+MI34 net077 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 net041 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
+MI653 Q net041 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI654 net096 net062 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI647 M1 M0 VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI649 M1 clkpos VNB nfet_01v8 m=1 w=0.64 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI671 net0115 SLEEP_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
+MI670 net0123 SLEEP_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
+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=0.64 l=0.15 mult=1 sa=0.265
+MI643 clkneg CLK 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
-MI635 clkpos clkneg VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI635 clkpos clkneg 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
+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
-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 net0133 net062 VPB phighvt m=1 w=1.0 l=0.25 mult=1 sa=0.265
+MI662 net0133 net062 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
+MI664 s0 clkpos 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
-MI664 s0 clkpos VPB phighvt 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
-MI658 net062 s0 VPB phighvt 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
-MI30 net0156 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
-MI663 net041 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
-MI660 Q net041 VPB phighvt m=1 w=1.26 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=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 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
-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
-MI672 clkneg SLEEP_B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MI658 net062 s0 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
-MI675 net0173 clkneg VPB phighvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
+MI30 net0156 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
-MI101 db sceb VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265 sb=0.265
+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
+MI663 net041 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
+MI660 Q net041 VPB pfet_01v8_hvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI648 M1 M0 VPB pfet_01v8_hvt m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI650 M1 clkneg VPB pfet_01v8_hvt m=1 w=0.84 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
+MI672 clkneg SLEEP_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
+MI675 net0173 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
+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
-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
+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
 .ENDS sky130_fd_sc_lp__srsdfxtp_1
diff --git a/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.netlist.tsv b/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.netlist.tsv
index ed9f254..0ab0533 100644
--- a/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.netlist.tsv
+++ b/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.netlist.tsv
@@ -1,43 +1,43 @@
 sky130_fd_sc_lp__srsdfxtp_1	CLK:I D:I SCD:I SCE:I SLEEP_B:I KAPWR: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
-MI676	MOSFET	net085	clkpos	s0	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI673	MOSFET	net061	net062	net096	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI642	MOSFET	clkneg	CLK	net0123	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI636	MOSFET	clkpos	clkneg	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI674	MOSFET	net062	s0	net079	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
-MI656	MOSFET	net079	s0	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	net077	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	net077	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	net061	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI652	MOSFET	net041	s0	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI653	MOSFET	Q	net041	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI654	MOSFET	net096	net062	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	net085	VNB	nshort	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI671	MOSFET	net0115	SLEEP_B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI670	MOSFET	net0123	SLEEP_B	net0115	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	clkneg	CLK	KAPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI635	MOSFET	clkpos	clkneg	VPWR	VPB	phighvt	1	0.64	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	net0133	net062	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI664	MOSFET	s0	clkpos	net0133	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI658	MOSFET	net062	s0	KAPWR	VPB	phighvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI30	MOSFET	net0156	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	net0156	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI663	MOSFET	net041	s0	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI660	MOSFET	Q	net041	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI648	MOSFET	M1	M0	VPWR	VPB	phighvt	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	M1	clkneg	net0173	VPB	phighvt	1	0.84	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
-MI672	MOSFET	clkneg	SLEEP_B	KAPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI675	MOSFET	net0173	clkneg	s0	VPB	phighvt	1	0.84	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
+MI676	MOSFET	net085	clkpos	s0	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI673	MOSFET	net061	net062	net096	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI642	MOSFET	clkneg	CLK	net0123	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI636	MOSFET	clkpos	clkneg	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI674	MOSFET	net062	s0	net079	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
+MI656	MOSFET	net079	s0	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	net077	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	net077	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	net061	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI652	MOSFET	net041	s0	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI653	MOSFET	Q	net041	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI654	MOSFET	net096	net062	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	net085	VNB	nfet_01v8	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI671	MOSFET	net0115	SLEEP_B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI670	MOSFET	net0123	SLEEP_B	net0115	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	clkneg	CLK	KAPWR	VPB	pfet_01v8_hvt	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.64	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	net0133	net062	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI664	MOSFET	s0	clkpos	net0133	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI658	MOSFET	net062	s0	KAPWR	VPB	pfet_01v8_hvt	1	1.0	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI30	MOSFET	net0156	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	net0156	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI663	MOSFET	net041	s0	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI660	MOSFET	Q	net041	VPWR	VPB	pfet_01v8_hvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI648	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
+MI650	MOSFET	M1	clkneg	net0173	VPB	pfet_01v8_hvt	1	0.84	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
+MI672	MOSFET	clkneg	SLEEP_B	KAPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI675	MOSFET	net0173	clkneg	s0	VPB	pfet_01v8_hvt	1	0.84	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
diff --git a/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.spice b/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.spice
index bf15bed..c187c3d 100644
--- a/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.spice
+++ b/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.spice
@@ -17,86 +17,45 @@
 
 .subckt sky130_fd_sc_lp__srsdfxtp_1 CLK D SCD SCE SLEEP_B KAPWR VGND VNB VPB VPWR
 + Q
-M1000 a_204_477# SCE VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.52888e+12p ps=1.147e+07u
-M1001 a_1858_419# a_570_47# a_1319_69# VPB phighvt w=1e+06u l=250000u
-+  ad=2.4e+11p pd=2.48e+06u as=5.244e+11p ps=4.82e+06u
-M1002 a_2321_178# SLEEP_B a_2243_178# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.008e+11p ps=1.32e+06u
-M1003 a_282_477# D a_210_47# VNB nshort w=420000u l=150000u
-+  ad=2.835e+11p pd=3.03e+06u as=1.008e+11p ps=1.32e+06u
-M1004 a_368_477# a_31_477# a_282_477# VPB phighvt w=640000u l=150000u
-+  ad=2.048e+11p pd=1.92e+06u as=3.283e+11p ps=3.39e+06u
-M1005 a_786_139# a_540_21# a_282_477# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1006 VGND a_1493_21# a_1523_113# VNB nshort w=420000u l=150000u
-+  ad=1.3371e+12p pd=1.18e+07u as=8.82e+10p ps=1.26e+06u
-M1007 a_1493_21# a_1319_69# a_1704_125# VNB nshort w=420000u l=150000u
-+  ad=1.738e+11p pd=1.68e+06u as=8.82e+10p ps=1.26e+06u
-M1008 a_872_139# a_570_47# a_786_139# VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1009 a_1372_379# a_540_21# a_914_245# VPB phighvt w=840000u l=150000u
-+  ad=1.764e+11p pd=2.1e+06u as=3.346e+11p ps=2.86e+06u
-M1010 a_540_21# SLEEP_B KAPWR VPB phighvt w=640000u l=150000u
-+  ad=3.52e+11p pd=2.38e+06u as=7.108e+11p ps=5.58e+06u
-M1011 VPWR a_1319_69# a_2504_57# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1012 a_1319_69# a_570_47# a_1247_69# VNB nshort w=640000u l=150000u
-+  ad=3.099e+11p pd=2.3e+06u as=1.344e+11p ps=1.7e+06u
-M1013 a_2243_178# CLK a_540_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.68e+11p ps=1.64e+06u
-M1014 a_1319_69# a_540_21# a_1372_379# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 KAPWR CLK a_540_21# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VGND SCD a_396_47# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.008e+11p ps=1.32e+06u
-M1017 KAPWR a_1493_21# a_1858_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_396_47# SCE a_282_477# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_1523_113# a_1493_21# a_1451_113# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1020 a_1704_125# a_1319_69# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_282_477# D a_204_477# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 a_1010_530# a_540_21# a_786_139# VPB phighvt w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=1.176e+11p ps=1.4e+06u
-M1023 a_914_245# a_786_139# VPWR VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 Q a_2504_57# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1025 a_570_47# a_540_21# VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1026 a_1451_113# a_540_21# a_1319_69# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_570_47# a_540_21# VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.824e+11p pd=1.85e+06u as=0p ps=0u
-M1028 a_1247_69# a_570_47# a_914_245# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=3.392e+11p ps=2.34e+06u
-M1029 a_1493_21# a_1319_69# KAPWR VPB phighvt w=1e+06u l=250000u
-+  ad=4.35e+11p pd=2.87e+06u as=0p ps=0u
-M1030 VPWR SCE a_31_477# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1031 Q a_2504_57# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1032 VGND a_1319_69# a_2504_57# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1033 VGND SLEEP_B a_2321_178# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND a_914_245# a_872_139# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_786_139# a_570_47# a_282_477# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR a_914_245# a_1010_530# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 a_210_47# a_31_477# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_914_245# a_786_139# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR SCD a_368_477# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1040 VGND SCE a_31_477# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
+X0 a_786_139# a_540_21# a_1010_530# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_1010_530# a_914_245# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 VGND a_786_139# a_914_245# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 a_1247_69# a_570_47# a_1319_69# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X4 VGND a_2504_57# Q VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 a_210_47# D a_282_477# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_282_477# SCE a_396_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 KAPWR SLEEP_B a_540_21# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 a_914_245# a_540_21# a_1372_379# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X9 a_1372_379# a_540_21# a_1319_69# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 a_786_139# a_570_47# a_872_139# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VGND a_31_477# a_210_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_1704_125# a_1319_69# a_1493_21# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 a_2504_57# a_1319_69# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 a_368_477# SCD VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X15 VPWR a_540_21# a_570_47# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X16 a_2321_178# SLEEP_B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_282_477# a_31_477# a_368_477# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 a_204_477# D a_282_477# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X19 VGND a_1319_69# a_1704_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 KAPWR a_1319_69# a_1493_21# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X21 a_872_139# a_914_245# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X22 VPWR a_786_139# a_914_245# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X23 a_1319_69# a_540_21# a_1451_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 a_540_21# CLK KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X25 a_2243_178# SLEEP_B a_2321_178# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_1523_113# a_1493_21# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X27 a_31_477# SCE VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X28 VGND a_540_21# a_570_47# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X29 a_1319_69# a_570_47# a_1858_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X30 a_282_477# a_570_47# a_786_139# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X31 a_540_21# CLK a_2243_178# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X32 VPWR SCE a_204_477# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X33 a_396_47# SCD VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X34 a_1451_113# a_1493_21# a_1523_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X35 a_1858_419# a_1493_21# KAPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X36 a_31_477# SCE VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X37 a_282_477# a_540_21# a_786_139# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X38 a_914_245# a_570_47# a_1247_69# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X39 VPWR a_2504_57# Q VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X40 a_2504_57# a_1319_69# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_0.cdl b/cells/xnor2/sky130_fd_sc_lp__xnor2_0.cdl
index 452e160..e008289 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_0.cdl
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__xnor2_0 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid 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
-MMNaoi11 nmid 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
-MMNaoi20 Y inand VNB nshort m=1 w=0.42 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.64 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND 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
-MMPnand1 inand B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA 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
-MMPaoi10 VPWR A 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
-MMPaoi11 sndPA B VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNaoi10 nmid 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
-MMPaoi20 Y inand VPB phighvt m=1 w=0.64 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid 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
+MMNaoi20 Y inand VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 inand A 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
+MMPnand1 inand 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
+MMPaoi10 VPWR A 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
+MMPaoi11 sndPA 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
+MMPaoi20 Y inand 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_lp__xnor2_0
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_0.netlist.tsv b/cells/xnor2/sky130_fd_sc_lp__xnor2_0.netlist.tsv
index d4f788b..f5026b0 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_0.netlist.tsv
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__xnor2_0	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	inand	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPA	B	Y	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	inand	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	1	0.42	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.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPA	B	Y	VPB	pfet_01v8_hvt	1	0.64	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.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_0.spice b/cells/xnor2/sky130_fd_sc_lp__xnor2_0.spice
index c7b3115..9430b2f 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_0.spice
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__xnor2_0 A B VGND VNB VPB VPWR Y
-M1000 a_143_487# A VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=7.36e+11p ps=6.14e+06u
-M1001 a_143_487# B a_110_177# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=8.82e+10p ps=1.26e+06u
-M1002 Y a_143_487# a_300_60# VNB nshort w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=2.289e+11p ps=2.77e+06u
-M1003 VGND A a_300_60# VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=0p ps=0u
-M1004 VPWR B a_143_487# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_383_487# A VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.344e+11p pd=1.7e+06u as=0p ps=0u
-M1006 a_110_177# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 Y B a_383_487# VPB phighvt w=640000u l=150000u
-+  ad=1.92e+11p pd=1.88e+06u as=0p ps=0u
-M1008 VPWR a_143_487# Y VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_300_60# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_143_487# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 VPWR A a_383_487# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_383_487# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X3 a_300_60# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_110_177# B a_143_487# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 VGND A a_110_177# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND B a_300_60# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_300_60# a_143_487# Y VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 VPWR A a_143_487# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X9 Y a_143_487# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_1.cdl b/cells/xnor2/sky130_fd_sc_lp__xnor2_1.cdl
index f4c6645..a5ec81d 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_1.cdl
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 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.84 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.84 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.84 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.84 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.26 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPnand1 inand B VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 VPWR A VPB phighvt m=1 w=1.26 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.26 l=0.15 mult=1 sa=0.265
+MMNaoi10 nmid A VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi20 Y inand VPB phighvt m=1 w=1.26 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 Y inand VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 inand A VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__xnor2_1
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_1.netlist.tsv b/cells/xnor2/sky130_fd_sc_lp__xnor2_1.netlist.tsv
index 4f87cbf..48b008d 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_1.netlist.tsv
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	inand	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	A	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPA	B	Y	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	inand	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_1.spice b/cells/xnor2/sky130_fd_sc_lp__xnor2_1.spice
index 3410bce..f00180d 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_1.spice
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__xnor2_1 A B VGND VNB VPB VPWR Y
-M1000 a_302_47# B VGND VNB nshort w=840000u l=150000u
-+  ad=5.124e+11p pd=4.58e+06u as=5.502e+11p ps=4.67e+06u
-M1001 Y B a_385_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.347e+11p pd=3.21e+06u as=4.914e+11p ps=3.3e+06u
-M1002 a_33_47# B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=1.6317e+12p ps=1.015e+07u
-M1003 Y a_33_47# a_302_47# VNB nshort w=840000u l=150000u
-+  ad=2.226e+11p pd=2.21e+06u as=0p ps=0u
-M1004 a_116_47# B a_33_47# VNB nshort w=840000u l=150000u
-+  ad=2.058e+11p pd=2.17e+06u as=2.226e+11p ps=2.21e+06u
-M1005 VPWR a_33_47# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A a_33_47# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A a_116_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_385_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A a_302_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_116_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 a_33_47# B a_116_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VPWR B a_33_47# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_302_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_302_47# a_33_47# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND B a_302_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_385_367# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_33_47# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR A a_385_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 Y a_33_47# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_2.cdl b/cells/xnor2/sky130_fd_sc_lp__xnor2_2.cdl
index 9e86ea0..6625d6e 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_2.cdl
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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=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
-MMNnand1 sndNA B VNB nshort 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
-MMNaoi10 nmid A VNB nshort 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
-MMNaoi11 nmid B VNB nshort 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
-MMNaoi20 Y inand VNB nshort 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
-MMPnand0 inand A VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A VNB nfet_01v8 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 phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA B VNB nfet_01v8 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 phighvt m=2 w=1.26 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.26 l=0.15 mult=1 sa=0.265
+MMNaoi10 nmid A VNB nfet_01v8 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
-MMPaoi20 Y inand VPB phighvt m=2 w=1.26 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B VNB nfet_01v8 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
+MMNaoi20 Y inand VNB nfet_01v8 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
+MMPnand0 inand A VPB pfet_01v8_hvt m=2 w=1.26 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=1.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__xnor2_2
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_2.netlist.tsv b/cells/xnor2/sky130_fd_sc_lp__xnor2_2.netlist.tsv
index 59b1b2a..c045d8c 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_2.netlist.tsv
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	inand	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	A	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	B	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPA	B	Y	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	inand	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	A	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A	VPWR	VPB	pfet_01v8_hvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	B	VPWR	VPB	pfet_01v8_hvt	2	1.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_2.spice b/cells/xnor2/sky130_fd_sc_lp__xnor2_2.spice
index f6a53a7..07b352d 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_2.spice
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__xnor2_2 A B VGND VNB VPB VPWR Y
-M1000 VPWR A a_545_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.142e+12p pd=1.6e+07u as=7.056e+11p ps=6.16e+06u
-M1001 Y B a_545_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.0206e+12p pd=9.18e+06u as=0p ps=0u
-M1002 a_27_47# B a_162_367# VNB nshort w=840000u l=150000u
-+  ad=7.392e+11p pd=6.8e+06u as=2.352e+11p ps=2.24e+06u
-M1003 Y a_162_367# a_555_65# VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=9.744e+11p ps=9.04e+06u
-M1004 Y a_162_367# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_162_367# B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=0p ps=0u
-M1006 a_545_367# B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND A a_27_47# VNB nshort w=840000u l=150000u
-+  ad=1.3188e+12p pd=8.18e+06u as=0p ps=0u
-M1008 VGND A a_555_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_555_65# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_545_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_27_47# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_555_65# a_162_367# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VPWR a_162_367# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR A a_162_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR B a_162_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_555_65# B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND B a_555_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_162_367# B a_27_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_162_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_162_367# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_162_367# B a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_545_367# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 Y B a_545_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_162_367# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND B a_555_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR A a_545_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_27_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 VGND A a_27_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 a_555_65# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_27_47# B a_162_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_545_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 VPWR B a_162_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 a_162_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VPWR A a_162_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 VGND A a_555_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X16 a_555_65# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 a_555_65# a_162_367# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 VPWR a_162_367# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 Y a_162_367# a_555_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_4.cdl b/cells/xnor2/sky130_fd_sc_lp__xnor2_4.cdl
index 5fb0f44..c7d602f 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_4.cdl
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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=4 w=0.84 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=4 w=0.84 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.84 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.84 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.84 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=4 w=1.26 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND A VNB nfet_01v8 m=4 w=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 phighvt m=4 w=1.26 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA B VNB nfet_01v8 m=4 w=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 phighvt m=4 w=1.26 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.26 l=0.15 mult=1 sa=0.265
+MMNaoi10 nmid A VNB nfet_01v8 m=4 w=0.84 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.26 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid B VNB nfet_01v8 m=4 w=0.84 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.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 inand A VPB pfet_01v8_hvt m=4 w=1.26 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=4 w=1.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
 + sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__xnor2_4
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_4.netlist.tsv b/cells/xnor2/sky130_fd_sc_lp__xnor2_4.netlist.tsv
index dda02aa..8d424a8 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_4.netlist.tsv
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	inand	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	A	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	B	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPA	B	Y	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	inand	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	A	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand0	MOSFET	inand	A	VPWR	VPB	pfet_01v8_hvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	B	VPWR	VPB	pfet_01v8_hvt	4	1.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_4.spice b/cells/xnor2/sky130_fd_sc_lp__xnor2_4.spice
index 3d30d2b..0c2b0f1 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_4.spice
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__xnor2_4 A B VGND VNB VPB VPWR Y
-M1000 a_31_65# B VGND VNB nshort w=840000u l=150000u
-+  ad=1.7136e+12p pd=1.584e+07u as=1.6128e+12p ps=1.392e+07u
-M1001 Y a_808_39# a_31_65# VNB nshort w=840000u l=150000u
-+  ad=5.292e+11p pd=4.62e+06u as=0p ps=0u
-M1002 a_110_367# B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=1.4112e+12p ps=1.232e+07u
-M1003 a_31_65# B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_808_39# B a_1235_65# VNB nshort w=840000u l=150000u
-+  ad=4.704e+11p pd=4.48e+06u as=1.1508e+12p ps=1.114e+07u
-M1005 VPWR a_808_39# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=4.33045e+12p pd=2.97e+07u as=0p ps=0u
-M1006 a_31_65# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_808_39# B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=1.4112e+12p pd=1.232e+07u as=0p ps=0u
-M1008 VPWR A a_808_39# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 Y a_808_39# a_31_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_31_65# a_808_39# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 VGND B a_31_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 Y B a_110_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_110_367# B Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_808_39# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_808_39# B a_1235_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 VPWR B a_808_39# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A a_31_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VGND A a_1235_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VPWR A a_110_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 Y a_808_39# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 VPWR B a_808_39# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 Y B a_110_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VGND B a_31_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_31_65# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_1235_65# B a_808_39# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_808_39# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 VGND A a_31_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_1235_65# B a_808_39# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_31_65# a_808_39# Y VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND A a_1235_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 a_110_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_1235_65# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 Y a_808_39# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 a_1235_65# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 a_808_39# B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 a_110_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR A a_110_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 VPWR a_808_39# Y VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 VPWR A a_808_39# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_808_39# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 VPWR A a_808_39# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X2 VPWR a_808_39# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_808_39# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 Y a_808_39# a_31_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 Y B a_110_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_110_367# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_31_65# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_808_39# B a_1235_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X9 VGND B a_31_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 VGND A a_1235_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X11 a_110_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_31_65# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_808_39# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 VPWR a_808_39# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_808_39# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 Y a_808_39# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 VGND A a_31_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_1235_65# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 VPWR A a_110_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 Y B a_110_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X21 a_31_65# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X22 a_110_367# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X23 a_1235_65# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X24 VGND A a_1235_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X25 VPWR B a_808_39# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 a_808_39# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X27 VGND A a_31_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X28 a_31_65# a_808_39# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 a_31_65# a_808_39# Y VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X30 a_110_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X31 VPWR A a_808_39# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X32 VPWR B a_808_39# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X33 Y a_808_39# a_31_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X34 a_1235_65# B a_808_39# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X35 a_31_65# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X36 a_808_39# B a_1235_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X37 VGND B a_31_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X38 a_1235_65# B a_808_39# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X39 VPWR A a_110_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_lp.cdl b/cells/xnor2/sky130_fd_sc_lp__xnor2_lp.cdl
index db93926..45efbbd 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_lp.cdl
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_lp.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__xnor2_lp 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid 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
-MMNaoi11 nmid 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
-MMNaoi20 Y inand VNB nshort m=1 w=0.42 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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 l=0.25 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.42 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 nmid 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
+MMNaoi11 nmid 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
+MMNaoi20 Y inand VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 inand A 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
+MMPnand1 inand B 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
+MMPaoi10 VPWR A 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
+MMPaoi11 sndPA B 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
+MMPaoi20 Y inand 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_lp__xnor2_lp
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_lp.netlist.tsv b/cells/xnor2/sky130_fd_sc_lp__xnor2_lp.netlist.tsv
index a855a31..d4b3d96 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_lp.netlist.tsv
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_lp.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__xnor2_lp	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	inand	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPA	B	Y	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	inand	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnand1	MOSFET	inand	B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPA	B	Y	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	Y	inand	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/xnor2/sky130_fd_sc_lp__xnor2_lp.spice b/cells/xnor2/sky130_fd_sc_lp__xnor2_lp.spice
index 256dea6..04a58fe 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_lp.spice
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_lp.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__xnor2_lp A B VGND VNB VPB VPWR Y
-M1000 Y a_82_66# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.8e+11p pd=2.56e+06u as=8.4e+11p ps=7.68e+06u
-M1001 a_112_92# B VGND VNB nshort w=420000u l=150000u
-+  ad=3.003e+11p pd=3.11e+06u as=2.331e+11p ps=2.79e+06u
-M1002 VPWR A a_280_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.4e+11p ps=2.48e+06u
-M1003 VPWR B a_82_66# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1004 VGND A a_112_92# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_510_125# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1006 a_280_419# B Y VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_82_66# A VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_82_66# B a_510_125# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1009 a_112_92# a_82_66# Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.155e+11p ps=1.39e+06u
+X0 a_280_419# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 Y B a_280_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_510_125# B a_82_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_112_92# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 VPWR a_82_66# Y VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X5 VGND B a_112_92# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_82_66# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 VGND A a_510_125# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 Y a_82_66# a_112_92# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VPWR A a_82_66# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_m.cdl b/cells/xnor2/sky130_fd_sc_lp__xnor2_m.cdl
index fcdefe1..45a083c 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_m.cdl
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__xnor2_m 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 nmid 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
-MMNaoi11 nmid 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
-MMNaoi20 Y inand VNB nshort m=1 w=0.42 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.42 l=0.15 mult=1 sa=0.265
+MMNnand0 VGND 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
-MMPnand1 inand B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNnand1 sndNA 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
-MMPaoi10 VPWR 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
-MMPaoi11 sndPA B VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNaoi10 nmid 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
-MMPaoi20 Y inand VPB phighvt m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMNaoi11 nmid 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
+MMNaoi20 Y inand VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnand0 inand 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
+MMPnand1 inand 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
+MMPaoi10 VPWR 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
+MMPaoi11 sndPA 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
+MMPaoi20 Y inand VPB pfet_01v8_hvt m=1 w=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_lp__xnor2_m
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_m.netlist.tsv b/cells/xnor2/sky130_fd_sc_lp__xnor2_m.netlist.tsv
index b6c4402..dd19f71 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_m.netlist.tsv
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__xnor2_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnand1	MOSFET	sndNA	B	inand	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	nmid	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	nmid	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	Y	inand	nmid	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand0	MOSFET	inand	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnand1	MOSFET	inand	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	sndPA	B	Y	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	Y	inand	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand0	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnand1	MOSFET	sndNA	B	inand	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	nmid	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	nmid	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	Y	inand	nmid	VNB	nfet_01v8	1	0.42	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.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	sndPA	B	Y	VPB	pfet_01v8_hvt	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_m.spice b/cells/xnor2/sky130_fd_sc_lp__xnor2_m.spice
index f96259b..2af2dcc 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_m.spice
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__xnor2_m A B VGND VNB VPB VPWR Y
-M1000 a_56_90# B VPWR VPB phighvt w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=3.549e+11p ps=4.21e+06u
-M1001 VPWR A a_56_90# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1002 a_139_90# B a_56_90# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.113e+11p ps=1.37e+06u
-M1003 a_297_90# A VGND VNB nshort w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=2.625e+11p ps=2.93e+06u
-M1004 VPWR a_56_90# Y VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=3.15e+11p ps=2.34e+06u
-M1005 VGND B a_297_90# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 a_297_90# a_56_90# Y VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1007 VGND A a_139_90# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_311_422# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1009 Y B a_311_422# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 Y a_56_90# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 Y a_56_90# a_297_90# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 VPWR B a_56_90# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VPWR A a_311_422# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_311_422# B Y VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X5 a_139_90# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_56_90# B a_139_90# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 VGND A a_297_90# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_297_90# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_56_90# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
 .ends
diff --git a/cells/xnor3/sky130_fd_sc_lp__xnor3_1.cdl b/cells/xnor3/sky130_fd_sc_lp__xnor3_1.cdl
index 70deece..1dcf808 100644
--- a/cells/xnor3/sky130_fd_sc_lp__xnor3_1.cdl
+++ b/cells/xnor3/sky130_fd_sc_lp__xnor3_1.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X net57 VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-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.84 l=0.15 mult=1 sa=0.265 sb=0.265
+MI17 Bb B VNB nfet_01v8 m=1 w=0.84 l=0.15 mult=1 sa=0.265 sb=0.265
 + sd=0.28 topography=normal area=0.063 perim=1.14
-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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP3 X net57 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.26 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_lp__xnor3_1
diff --git a/cells/xnor3/sky130_fd_sc_lp__xnor3_1.netlist.tsv b/cells/xnor3/sky130_fd_sc_lp__xnor3_1.netlist.tsv
index 0c2fc8b..b288c97 100644
--- a/cells/xnor3/sky130_fd_sc_lp__xnor3_1.netlist.tsv
+++ b/cells/xnor3/sky130_fd_sc_lp__xnor3_1.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_lp__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.84	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.84	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.26	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.26	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.84	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.84	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.26	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.26	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_lp__xnor3_1.spice b/cells/xnor3/sky130_fd_sc_lp__xnor3_1.spice
index b40cf8a..19cee8e 100644
--- a/cells/xnor3/sky130_fd_sc_lp__xnor3_1.spice
+++ b/cells/xnor3/sky130_fd_sc_lp__xnor3_1.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_lp__xnor3_1 A B C VGND VNB VPB VPWR X
-M1000 a_354_109# a_754_367# a_871_373# VNB nshort w=640000u l=150000u
-+  ad=4.032e+11p pd=3.82e+06u as=5.701e+11p ps=4.79e+06u
-M1001 a_355_451# a_754_367# a_1090_373# VNB nshort w=420000u l=150000u
-+  ad=4.846e+11p pd=4.15e+06u as=4.173e+11p ps=4.01e+06u
-M1002 a_754_367# B VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=1.10875e+12p ps=7.97e+06u
-M1003 VGND A a_871_373# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_1090_373# B a_354_109# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_1090_373# a_871_373# VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=4.642e+11p pd=4.41e+06u as=1.26e+12p ps=9.44e+06u
-M1006 a_244_137# C VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=0p ps=0u
-M1007 a_871_373# B a_355_451# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_354_109# a_754_367# a_1090_373# VPB phighvt w=640000u l=150000u
-+  ad=6.356e+11p pd=4.99e+06u as=0p ps=0u
-M1009 a_355_451# a_244_137# a_81_259# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=2.24e+11p ps=1.98e+06u
-M1010 a_81_259# C a_354_109# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_81_259# C a_355_451# VPB phighvt w=840000u l=150000u
-+  ad=3.612e+11p pd=2.89e+06u as=5.408e+11p ps=4.7e+06u
-M1012 a_355_451# a_754_367# a_871_373# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=9.1105e+11p ps=6.07e+06u
-M1013 a_871_373# B a_354_109# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_244_137# C VPWR VPB phighvt w=640000u l=150000u
-+  ad=1.728e+11p pd=1.82e+06u as=0p ps=0u
-M1015 a_1090_373# a_871_373# VGND VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_354_109# a_244_137# a_81_259# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1090_373# B a_355_451# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 VPWR A a_871_373# VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 VGND a_81_259# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1020 VPWR a_81_259# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.402e+11p ps=3.06e+06u
-M1021 a_754_367# B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
+X0 a_355_451# B a_1090_373# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 a_1090_373# a_754_367# a_354_109# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X2 a_354_109# B a_1090_373# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X3 X a_81_259# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VGND a_871_373# a_1090_373# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X5 a_81_259# a_244_137# a_354_109# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X6 VPWR a_871_373# a_1090_373# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 a_871_373# a_754_367# a_354_109# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X8 X a_81_259# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_355_451# C a_81_259# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X10 VPWR B a_754_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_871_373# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X12 a_871_373# a_754_367# a_355_451# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X13 a_354_109# C a_81_259# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X14 a_871_373# A VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 a_354_109# B a_871_373# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X16 VGND C a_244_137# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 VPWR C a_244_137# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X18 a_81_259# a_244_137# a_355_451# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X19 a_1090_373# a_754_367# a_355_451# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_355_451# B a_871_373# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 VGND B a_754_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.cdl b/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.cdl
index ce356c0..0e28597 100644
--- a/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.cdl
+++ b/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.cdl
@@ -16,58 +16,58 @@
 
 .SUBCKT sky130_fd_sc_lp__xnor3_lp 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 net75 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X net75 VNB nfet_01v8 m=1 w=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 net43 net75 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI13 net43 net75 VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI29 Ab Bb VNB nfet_01v8 m=1 w=0.42 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.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
-MI25 Abb Bb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI17 Bb 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
-MI17 Bb B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI649 mid1 Cb VNB nfet_01v8 m=1 w=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 Cb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI44 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
-MI44 Ab A 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
-MI34 Cb C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI2 mid2 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI46 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
-MI46 Abb Ab VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI24 Ab 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
-MI24 Ab B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI28 Abb 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
-MI28 Abb B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI12 net79 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
-MI12 net79 C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI11 net56 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
-MI11 net56 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI9 net52 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
-MI9 net52 Ab VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI8 net48 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
-MI8 net48 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP3 X net75 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
+MI650 mid1 C 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
-MMIP3 X net75 VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI27 mid2 B 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
-MI650 mid1 C VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI47 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
-MI27 mid2 B VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI23 mid1 B 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
-MI47 Abb Ab VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI26 mid2 Bb 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
-MI23 mid1 B VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI7 mid2 Cb 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
-MI26 mid2 Bb VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI33 Cb C 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
-MI7 mid2 Cb VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI45 Ab A 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
-MI33 Cb C 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
-MI45 Ab A 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
-MI16 Bb B 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
-MI19 mid1 Bb VPB phighvt m=1 w=1 l=0.25 mult=1 sa=0.265 sb=0.265
+MI16 Bb B 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
+MI19 mid1 Bb 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_lp__xnor3_lp
diff --git a/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.netlist.tsv b/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.netlist.tsv
index fcea7f4..58756bf 100644
--- a/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.netlist.tsv
+++ b/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.netlist.tsv
@@ -1,29 +1,29 @@
 sky130_fd_sc_lp__xnor3_lp	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	net75	net43	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI13	MOSFET	net43	net75	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	Ab	Bb	mid2	VNB	nshort	1	0.42	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	net48	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	mid1	Cb	net75	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	Ab	A	net56	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	Cb	C	net79	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	mid2	C	net75	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	Abb	Ab	net52	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Ab	B	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI12	MOSFET	net79	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI11	MOSFET	net56	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI9	MOSFET	net52	Ab	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI8	MOSFET	net48	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIP3	MOSFET	X	net75	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	mid1	C	net75	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	mid2	B	Ab	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	mid1	B	Abb	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	mid2	Bb	Abb	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	mid2	Cb	net75	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Cb	C	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	mid1	Bb	Ab	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	net75	net43	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI13	MOSFET	net43	net75	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	Ab	Bb	mid2	VNB	nfet_01v8	1	0.42	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	net48	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	mid1	Cb	net75	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	Ab	A	net56	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	Cb	C	net79	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	mid2	C	net75	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	Abb	Ab	net52	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Ab	B	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI12	MOSFET	net79	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI11	MOSFET	net56	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI9	MOSFET	net52	Ab	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI8	MOSFET	net48	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	net75	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	mid1	C	net75	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	mid2	B	Ab	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	mid1	B	Abb	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	mid2	Bb	Abb	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	mid2	Cb	net75	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	Cb	C	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	mid1	Bb	Ab	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.spice b/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.spice
index cf568d8..7e4abdb 100644
--- a/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.spice
+++ b/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.spice
@@ -16,58 +16,31 @@
 
 
 .subckt sky130_fd_sc_lp__xnor3_lp A B C VGND VNB VPB VPWR X
-M1000 VPWR C a_1318_85# VPB phighvt w=1e+06u l=250000u
-+  ad=9.453e+11p pd=7.99e+06u as=2.85e+11p ps=2.57e+06u
-M1001 a_1860_132# a_1348_111# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=4.494e+11p ps=4.66e+06u
-M1002 a_1348_111# a_1318_85# a_803_81# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=5.538e+11p ps=4.37e+06u
-M1003 a_647_367# B VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1004 a_114_109# A a_27_109# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=2.373e+11p ps=2.81e+06u
-M1005 a_763_347# C a_1348_111# VNB nshort w=420000u l=150000u
-+  ad=3.094e+11p pd=3.41e+06u as=0p ps=0u
-M1006 a_27_109# a_647_367# a_803_81# VPB phighvt w=1e+06u l=250000u
-+  ad=5.65e+11p pd=5.13e+06u as=5.65e+11p ps=5.13e+06u
-M1007 a_1348_111# a_1318_85# a_763_347# VPB phighvt w=1e+06u l=250000u
-+  ad=2.8e+11p pd=2.56e+06u as=7.6335e+11p ps=5.77e+06u
-M1008 a_265_409# a_647_367# a_803_81# VNB nshort w=420000u l=150000u
-+  ad=2.709e+11p pd=2.97e+06u as=0p ps=0u
-M1009 VGND C a_1634_89# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.74125e+11p ps=1.92e+06u
-M1010 a_265_409# a_27_109# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=8.95e+11p pd=5.79e+06u as=0p ps=0u
-M1011 a_265_409# a_647_367# a_763_347# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_570_101# B VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1013 X a_1348_111# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1014 a_803_81# B a_265_409# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 a_265_409# a_27_109# a_272_109# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1016 a_763_347# B a_27_109# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1634_89# C a_1318_85# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1018 VGND A a_114_109# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_1348_111# a_1860_132# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=0p ps=0u
-M1020 a_272_109# a_27_109# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_647_367# B a_570_101# VNB nshort w=420000u l=150000u
-+  ad=1.533e+11p pd=1.57e+06u as=0p ps=0u
-M1022 a_803_81# C a_1348_111# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_27_109# a_647_367# a_763_347# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 VPWR A a_27_109# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_803_81# B a_27_109# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 a_763_347# B a_265_409# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_763_347# a_647_367# a_27_109# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_1860_132# a_1348_111# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_265_409# B a_763_347# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_265_409# B a_803_81# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 a_1318_85# C a_1634_89# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_1634_89# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_763_347# a_647_367# a_265_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X7 a_1348_111# C a_803_81# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X8 VGND a_1348_111# a_1860_132# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 a_27_109# B a_803_81# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_803_81# a_1318_85# a_1348_111# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 VPWR a_27_109# a_265_409# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 a_114_109# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X13 VPWR a_1348_111# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X14 VPWR B a_647_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X15 a_27_109# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X16 a_27_109# A a_114_109# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X17 a_272_109# a_27_109# a_265_409# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 a_570_101# B a_647_367# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_1348_111# C a_763_347# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_803_81# a_647_367# a_265_409# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X21 a_763_347# a_1318_85# a_1348_111# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X22 a_27_109# B a_763_347# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X23 a_1318_85# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X24 VGND a_27_109# a_272_109# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X25 VGND B a_570_101# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_803_81# a_647_367# a_27_109# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
 .ends
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_0.cdl b/cells/xor2/sky130_fd_sc_lp__xor2_0.cdl
index 849af42..0d57de5 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_0.cdl
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_0.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__xor2_0 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND 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
-MMNaoi11 sndNA 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
-MMNaoi20 X inor VNB nshort m=1 w=0.42 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=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 sndPA 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
-MMPaoi10 pmid A 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
-MMPaoi11 pmid 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
-MMPaoi20 X inor 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
+MMNnor0 inor 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
+MMNnor1 inor 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
+MMNaoi10 VGND 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
+MMNaoi11 sndNA 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
+MMNaoi20 X inor VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A 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
+MMPnor1 sndPA 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
+MMPaoi10 pmid A 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
+MMPaoi11 pmid 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
+MMPaoi20 X inor 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_lp__xor2_0
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_0.netlist.tsv b/cells/xor2/sky130_fd_sc_lp__xor2_0.netlist.tsv
index fe8d4df..b4f6315 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_0.netlist.tsv
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_0.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__xor2_0	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNA	B	X	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	X	inor	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A	sndPA	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA	B	inor	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	A	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B	VPWR	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	X	inor	pmid	VPB	phighvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNA	B	X	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	X	inor	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA	B	inor	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	A	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B	VPWR	VPB	pfet_01v8_hvt	1	0.64	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	X	inor	pmid	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/xor2/sky130_fd_sc_lp__xor2_0.spice b/cells/xor2/sky130_fd_sc_lp__xor2_0.spice
index 92c0520..9a3570b 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_0.spice
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_0.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__xor2_0 A B VGND VNB VPB VPWR X
-M1000 a_274_481# A VPWR VPB phighvt w=640000u l=150000u
-+  ad=3.488e+11p pd=3.65e+06u as=3.488e+11p ps=3.65e+06u
-M1001 a_110_481# B a_27_481# VPB phighvt w=640000u l=150000u
-+  ad=1.536e+11p pd=1.76e+06u as=1.696e+11p ps=1.81e+06u
-M1002 VGND A a_27_481# VNB nshort w=420000u l=150000u
-+  ad=3.402e+11p pd=4.14e+06u as=1.176e+11p ps=1.4e+06u
-M1003 VPWR A a_110_481# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_317_85# A VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=0p ps=0u
-M1005 X B a_317_85# VNB nshort w=420000u l=150000u
-+  ad=3.465e+11p pd=2.49e+06u as=0p ps=0u
-M1006 VPWR B a_274_481# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_274_481# a_27_481# X VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.696e+11p ps=1.81e+06u
-M1008 VGND a_27_481# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 a_27_481# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_27_481# B a_110_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X1 VGND B a_27_481# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X2 a_27_481# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 a_110_481# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X4 X a_27_481# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_317_85# B X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VPWR A a_274_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X7 a_274_481# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X8 VGND A a_317_85# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 X a_27_481# a_274_481# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
 .ends
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_1.cdl b/cells/xor2/sky130_fd_sc_lp__xor2_1.cdl
index e025923..18a8959 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_1.cdl
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_1.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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.84 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.84 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.84 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.84 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.84 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.26 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.26 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.26 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.26 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.26 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.84 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.84 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.84 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.84 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.84 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__xor2_1
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_1.netlist.tsv b/cells/xor2/sky130_fd_sc_lp__xor2_1.netlist.tsv
index 9472caa..35892d3 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_1.netlist.tsv
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_1.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	B	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNA	B	X	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	X	inor	VGND	VNB	nshort	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A	sndPA	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA	B	inor	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	A	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B	VPWR	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	X	inor	pmid	VPB	phighvt	1	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	B	VGND	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNA	B	X	VNB	nfet_01v8	1	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	X	inor	VGND	VNB	nfet_01v8	1	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_1.spice b/cells/xor2/sky130_fd_sc_lp__xor2_1.spice
index 9d36921..69f4531 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_1.spice
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_1.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__xor2_1 A B VGND VNB VPB VPWR X
-M1000 VGND a_42_367# X VNB nshort w=840000u l=150000u
-+  ad=9.366e+11p pd=7.27e+06u as=4.872e+11p ps=2.84e+06u
-M1001 a_125_367# B a_42_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.024e+11p pd=3e+06u as=3.339e+11p ps=3.05e+06u
-M1002 a_297_69# A VGND VNB nshort w=840000u l=150000u
-+  ad=2.016e+11p pd=2.16e+06u as=0p ps=0u
-M1003 X B a_297_69# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 VPWR B a_293_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=8.566e+11p pd=6.56e+06u as=6.867e+11p ps=6.13e+06u
-M1005 a_293_367# a_42_367# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.591e+11p ps=3.09e+06u
-M1006 VPWR A a_125_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_293_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_42_367# B VGND VNB nshort w=840000u l=150000u
-+  ad=2.352e+11p pd=2.24e+06u as=0p ps=0u
-M1009 VGND A a_42_367# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VGND B a_42_367# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 X a_42_367# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_293_367# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X3 a_297_69# B X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR A a_293_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 a_42_367# B a_125_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X6 a_42_367# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 VGND A a_297_69# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_125_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 X a_42_367# a_293_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_2.cdl b/cells/xor2/sky130_fd_sc_lp__xor2_2.cdl
index 8be59e5..a678b2f 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_2.cdl
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_2.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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=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
-MMNnor1 inor B VNB nshort 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
-MMNaoi10 VGND A VNB nshort 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
-MMNaoi11 sndNA B VNB nshort 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
-MMNaoi20 X inor VNB nshort 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
-MMPnor0 VPWR A VPB phighvt m=2 w=1.26 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.26 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.26 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.26 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.26 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.84 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.84 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.84 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.84 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.84 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.26 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.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__xor2_2
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_2.netlist.tsv b/cells/xor2/sky130_fd_sc_lp__xor2_2.netlist.tsv
index a61e153..9a02ae7 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_2.netlist.tsv
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_2.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	B	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNA	B	X	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	X	inor	VGND	VNB	nshort	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A	sndPA	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA	B	inor	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	A	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B	VPWR	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	X	inor	pmid	VPB	phighvt	2	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	B	VGND	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNA	B	X	VNB	nfet_01v8	2	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	X	inor	VGND	VNB	nfet_01v8	2	0.84	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.26	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.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_2.spice b/cells/xor2/sky130_fd_sc_lp__xor2_2.spice
index 1818ffe..82c1904 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_2.spice
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_2.spice
@@ -16,44 +16,24 @@
 
 
 .subckt sky130_fd_sc_lp__xor2_2 A B VGND VNB VPB VPWR X
-M1000 a_149_367# B a_149_65# VPB phighvt w=1.26e+06u l=150000u
-+  ad=8.19e+11p pd=6.34e+06u as=3.528e+11p ps=3.08e+06u
-M1001 a_149_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=1.8758e+12p ps=1.335e+07u
-M1002 X a_149_65# a_532_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.528e+11p pd=3.08e+06u as=1.3734e+12p ps=1.226e+07u
-M1003 VGND A a_149_65# VNB nshort w=840000u l=150000u
-+  ad=1.8502e+12p pd=1.342e+07u as=6.636e+11p ps=4.94e+06u
-M1004 a_149_65# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 VPWR B a_532_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VPWR A a_532_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 VGND a_149_65# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=4.914e+11p ps=4.53e+06u
-M1008 a_814_65# A VGND VNB nshort w=840000u l=150000u
-+  ad=7.77e+11p pd=5.21e+06u as=0p ps=0u
-M1009 VGND B a_149_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 VGND A a_814_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_149_65# B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_814_65# B X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 a_532_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_149_65# B a_149_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VPWR A a_149_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_532_367# a_149_65# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_532_367# B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 X B a_814_65# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X a_149_65# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_814_65# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X1 X B a_814_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 VGND B a_149_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 VGND A a_149_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 a_149_65# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X5 VGND a_149_65# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 VPWR A a_149_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X7 a_149_65# B a_149_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 VPWR B a_532_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 VGND A a_814_65# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X10 a_532_367# a_149_65# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 a_814_65# B X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X12 X a_149_65# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X13 a_149_367# B a_149_65# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_532_367# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 a_532_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_149_65# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X17 X a_149_65# a_532_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X18 VPWR A a_532_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_149_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
 .ends
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_4.cdl b/cells/xor2/sky130_fd_sc_lp__xor2_4.cdl
index 91c93f4..d39ea5f 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_4.cdl
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_4.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__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=4 w=0.84 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=4 w=0.84 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.84 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.84 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=4 w=0.84 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=4 w=1.26 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=4 w=1.26 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.26 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.26 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.26 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=4 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNnor1 inor B VNB nfet_01v8 m=4 w=0.84 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.84 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.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi20 X inor VNB nfet_01v8 m=4 w=0.84 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR A VPB pfet_01v8_hvt m=4 w=1.26 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=4 w=1.26 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.26 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.26 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.26 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
 .ENDS sky130_fd_sc_lp__xor2_4
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_4.netlist.tsv b/cells/xor2/sky130_fd_sc_lp__xor2_4.netlist.tsv
index b69a868..4730e11 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_4.netlist.tsv
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_4.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__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	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	B	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNA	B	X	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	X	inor	VGND	VNB	nshort	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A	sndPA	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA	B	inor	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	A	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B	VPWR	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	X	inor	pmid	VPB	phighvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	B	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNA	B	X	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	X	inor	VGND	VNB	nfet_01v8	4	0.84	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	4	1.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA	B	inor	VPB	pfet_01v8_hvt	4	1.26	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.26	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.26	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.26	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_4.spice b/cells/xor2/sky130_fd_sc_lp__xor2_4.spice
index 24e8bad..59ea140 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_4.spice
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_4.spice
@@ -16,84 +16,44 @@
 
 
 .subckt sky130_fd_sc_lp__xor2_4 A B VGND VNB VPB VPWR X
-M1000 VPWR A a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=2.1546e+12p pd=1.854e+07u as=2.4444e+12p ps=2.152e+07u
-M1001 a_776_255# B a_1199_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=7.056e+11p pd=6.16e+06u as=1.7262e+12p ps=1.534e+07u
-M1002 VGND B a_776_255# VNB nshort w=840000u l=150000u
-+  ad=2.6208e+12p pd=2.136e+07u as=9.408e+11p ps=8.96e+06u
-M1003 VPWR B a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_27_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1005 a_27_367# a_776_255# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=7.056e+11p ps=6.16e+06u
-M1006 VPWR A a_1199_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 X B a_110_47# VNB nshort w=840000u l=150000u
-+  ad=9.408e+11p pd=8.96e+06u as=9.408e+11p ps=8.96e+06u
-M1008 a_776_255# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VPWR B a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_27_367# a_776_255# X VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_776_255# B a_1199_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_110_47# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1013 VGND a_776_255# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 a_27_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1015 VGND B a_776_255# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1016 a_110_47# B X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 VGND A a_776_255# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_776_255# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 X B a_110_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 VGND A a_110_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_1199_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1022 X a_776_255# a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 a_1199_367# B a_776_255# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 X a_776_255# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 a_27_367# B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 X a_776_255# VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1027 a_1199_367# A VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1028 a_776_255# B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1029 a_776_255# B VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1030 VGND A a_110_47# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1031 VGND a_776_255# X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1032 a_27_367# B VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1033 a_110_47# B X VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1034 VGND A a_776_255# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1035 X a_776_255# a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1036 VPWR A a_1199_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1037 VPWR A a_27_367# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1038 a_1199_367# B a_776_255# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1039 a_110_47# A VGND VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 VPWR A a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X1 a_110_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X2 a_110_47# B X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X3 X B a_110_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X4 VPWR A a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X5 VGND A a_110_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X6 a_110_47# B X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X7 a_27_367# a_776_255# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X8 a_27_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X9 a_1199_367# B a_776_255# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X10 a_27_367# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X11 VPWR A a_1199_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X12 a_27_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X13 VPWR B a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X14 a_1199_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X15 X a_776_255# a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X16 a_27_367# a_776_255# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X17 X a_776_255# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X18 a_776_255# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X19 X a_776_255# a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X20 VGND B a_776_255# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X21 a_1199_367# B a_776_255# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X22 VGND a_776_255# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X23 a_1199_367# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X24 a_776_255# B a_1199_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X25 a_27_367# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X26 VGND A a_776_255# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X27 a_110_47# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X28 a_776_255# A VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X29 VGND A a_776_255# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X30 VGND A a_110_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X31 a_776_255# B a_1199_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X32 a_776_255# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X33 X B a_110_47# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X34 X a_776_255# VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X35 VGND B a_776_255# VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X36 VPWR B a_27_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X37 VPWR A a_1199_367# VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X38 VGND a_776_255# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X39 a_776_255# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
 .ends
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_lp.cdl b/cells/xor2/sky130_fd_sc_lp__xor2_lp.cdl
index 8840f59..acb8128 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_lp.cdl
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_lp.cdl
@@ -16,30 +16,30 @@
 
 .SUBCKT sky130_fd_sc_lp__xor2_lp A B VGND VNB VPB VPWR X
 *.PININFO A:I B:I VGND:I VNB:I VPB:I VPWR:I X:O
-MMNnor0 net77 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMNnor0 net77 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
+MMNnor1 inor 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
+MMNaoi10 VGND 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
+MMNaoi11 sndNA 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
+MMNaoi20 X inor VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI7 net57 inor VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MI5 net53 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
-MMNnor1 inor B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI6 inor 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
-MMNaoi10 VGND 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
-MMNaoi11 sndNA 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
-MMNaoi20 X inor VNB nshort m=1 w=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 net57 inor VNB nshort m=1 w=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 net53 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
-MI6 inor 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
-MMPnor0 VPWR A 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
-MMPnor1 sndPA B 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
-MMPaoi10 pmid A 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
-MMPaoi11 pmid B 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
-MMPaoi20 X inor 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
+MMPnor0 VPWR A 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
+MMPnor1 sndPA B 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
+MMPaoi10 pmid A 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
+MMPaoi11 pmid B 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
+MMPaoi20 X inor 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_lp__xor2_lp
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_lp.netlist.tsv b/cells/xor2/sky130_fd_sc_lp__xor2_lp.netlist.tsv
index ec07967..35dfe59 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_lp.netlist.tsv
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_lp.netlist.tsv
@@ -1,15 +1,15 @@
 sky130_fd_sc_lp__xor2_lp	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	net77	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	B	net53	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNA	B	X	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	X	inor	net57	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI7	MOSFET	net57	inor	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI5	MOSFET	net53	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI6	MOSFET	inor	A	net77	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A	sndPA	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA	B	inor	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	A	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	X	inor	pmid	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	net77	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	B	net53	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNA	B	X	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	X	inor	net57	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI7	MOSFET	net57	inor	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI5	MOSFET	net53	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI6	MOSFET	inor	A	net77	VNB	nfet_01v8	1	0.42	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.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA	B	inor	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	A	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	X	inor	pmid	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_lp.spice b/cells/xor2/sky130_fd_sc_lp__xor2_lp.spice
index 58b078a..a4f0ac5 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_lp.spice
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_lp.spice
@@ -16,30 +16,17 @@
 
 
 .subckt sky130_fd_sc_lp__xor2_lp A B VGND VNB VPB VPWR X
-M1000 a_272_119# B X VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=1.176e+11p ps=1.4e+06u
-M1001 VPWR A a_159_419# VPB phighvt w=1e+06u l=250000u
-+  ad=5.65e+11p pd=5.13e+06u as=5.65e+11p ps=5.13e+06u
-M1002 a_114_119# a_84_93# VGND VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=4.35225e+11p ps=4.89e+06u
-M1003 a_84_93# B a_446_68# VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=1.008e+11p ps=1.32e+06u
-M1004 a_159_419# a_84_93# X VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=3e+11p ps=2.6e+06u
-M1005 a_159_419# B VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 VGND A a_272_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_446_68# B VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_610_68# A a_84_93# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=0p ps=0u
-M1009 VGND A a_610_68# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1010 a_590_412# B a_84_93# VPB phighvt w=1e+06u l=250000u
-+  ad=2.1e+11p pd=2.42e+06u as=2.85e+11p ps=2.57e+06u
-M1011 VPWR A a_590_412# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 X a_84_93# a_114_119# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_159_419# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X1 a_84_93# B a_590_412# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_114_119# a_84_93# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X3 X a_84_93# a_159_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X4 VGND a_84_93# a_114_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_272_119# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 X B a_272_119# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_610_68# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_590_412# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 VGND B a_446_68# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 VPWR B a_159_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X11 a_446_68# B a_84_93# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X12 a_84_93# A a_610_68# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_m.cdl b/cells/xor2/sky130_fd_sc_lp__xor2_m.cdl
index b244814..abae511 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_m.cdl
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_m.cdl
@@ -16,24 +16,24 @@
 
 .SUBCKT sky130_fd_sc_lp__xor2_m 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.42 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.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMNaoi10 VGND 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
-MMNaoi11 sndNA 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
-MMNaoi20 X inor VNB nshort m=1 w=0.42 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=0.42 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=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
-+ sd=0.28 topography=normal area=0.063 perim=1.14
-MMPaoi10 pmid 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
-MMPaoi11 pmid 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
-MMPaoi20 X inor VPB phighvt m=1 w=0.42 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.42 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.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMNaoi10 VGND 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
+MMNaoi11 sndNA 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
+MMNaoi20 X inor VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265
++ sb=0.265 sd=0.28 topography=normal area=0.063 perim=1.14
+MMPnor0 VPWR 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
+MMPnor1 sndPA 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
+MMPaoi10 pmid 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
+MMPaoi11 pmid 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
+MMPaoi20 X inor VPB pfet_01v8_hvt m=1 w=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_lp__xor2_m
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_m.netlist.tsv b/cells/xor2/sky130_fd_sc_lp__xor2_m.netlist.tsv
index f87256a..6ea5b0f 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_m.netlist.tsv
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_m.netlist.tsv
@@ -1,12 +1,12 @@
 sky130_fd_sc_lp__xor2_m	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNnor1	MOSFET	inor	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi11	MOSFET	sndNA	B	X	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMNaoi20	MOSFET	X	inor	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor0	MOSFET	VPWR	A	sndPA	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPnor1	MOSFET	sndPA	B	inor	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi10	MOSFET	pmid	A	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi11	MOSFET	pmid	B	VPWR	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MMPaoi20	MOSFET	X	inor	pmid	VPB	phighvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor0	MOSFET	inor	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNnor1	MOSFET	inor	B	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi10	MOSFET	VGND	A	sndNA	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi11	MOSFET	sndNA	B	X	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMNaoi20	MOSFET	X	inor	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor0	MOSFET	VPWR	A	sndPA	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPnor1	MOSFET	sndPA	B	inor	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi10	MOSFET	pmid	A	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi11	MOSFET	pmid	B	VPWR	VPB	pfet_01v8_hvt	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMPaoi20	MOSFET	X	inor	pmid	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/xor2/sky130_fd_sc_lp__xor2_m.spice b/cells/xor2/sky130_fd_sc_lp__xor2_m.spice
index 1b44641..2e43d9b 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_m.spice
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_m.spice
@@ -16,24 +16,14 @@
 
 
 .subckt sky130_fd_sc_lp__xor2_m A B VGND VNB VPB VPWR X
-M1000 a_41_535# B VGND VNB nshort w=420000u l=150000u
-+  ad=1.176e+11p pd=1.4e+06u as=5.082e+11p ps=4.94e+06u
-M1001 X a_41_535# a_282_535# VPB phighvt w=420000u l=150000u
-+  ad=1.113e+11p pd=1.37e+06u as=2.289e+11p ps=2.77e+06u
-M1002 VPWR A a_124_535# VPB phighvt w=420000u l=150000u
-+  ad=2.289e+11p pd=2.77e+06u as=8.82e+10p ps=1.26e+06u
-M1003 VGND a_41_535# X VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.121e+11p ps=1.85e+06u
-M1004 a_124_535# B a_41_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=1.113e+11p ps=1.37e+06u
-M1005 VPWR B a_282_535# VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1006 X B a_357_156# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1007 a_357_156# A VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1008 a_282_535# A VPWR VPB phighvt w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1009 VGND A a_41_535# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_124_535# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X1 a_41_535# B a_124_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X2 a_282_535# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X3 VPWR A a_282_535# VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X4 a_357_156# B X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 X a_41_535# VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 VGND B a_41_535# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_282_535# a_41_535# X VPB sky130_fd_pr__pfet_01v8_hvt w=420000u l=150000u
+X8 a_41_535# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X9 VGND A a_357_156# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends
diff --git a/cells/xor3/sky130_fd_sc_lp__xor3_1.cdl b/cells/xor3/sky130_fd_sc_lp__xor3_1.cdl
index a13488d..877e921 100644
--- a/cells/xor3/sky130_fd_sc_lp__xor3_1.cdl
+++ b/cells/xor3/sky130_fd_sc_lp__xor3_1.cdl
@@ -16,48 +16,48 @@
 
 .SUBCKT sky130_fd_sc_lp__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.26 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIP3 X net117 VPB pfet_01v8_hvt m=1 w=1.26 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.26 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.84 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.26 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.84 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.84 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.84 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_lp__xor3_1
diff --git a/cells/xor3/sky130_fd_sc_lp__xor3_1.netlist.tsv b/cells/xor3/sky130_fd_sc_lp__xor3_1.netlist.tsv
index 89daa59..44f000e 100644
--- a/cells/xor3/sky130_fd_sc_lp__xor3_1.netlist.tsv
+++ b/cells/xor3/sky130_fd_sc_lp__xor3_1.netlist.tsv
@@ -1,24 +1,24 @@
 sky130_fd_sc_lp__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.26	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.26	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.84	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.84	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.26	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.26	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.84	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.84	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_lp__xor3_1.spice b/cells/xor3/sky130_fd_sc_lp__xor3_1.spice
index e401d69..653463b 100644
--- a/cells/xor3/sky130_fd_sc_lp__xor3_1.spice
+++ b/cells/xor3/sky130_fd_sc_lp__xor3_1.spice
@@ -16,48 +16,26 @@
 
 
 .subckt sky130_fd_sc_lp__xor3_1 A B C VGND VNB VPB VPWR X
-M1000 VPWR a_86_305# a_42_411# VPB phighvt w=1e+06u l=150000u
-+  ad=1.8618e+12p pd=1.038e+07u as=4.642e+11p ps=4.41e+06u
-M1001 a_1363_127# a_1263_295# a_402_411# VNB nshort w=640000u l=150000u
-+  ad=1.792e+11p pd=1.84e+06u as=6.932e+11p ps=4.77e+06u
-M1002 a_402_411# B a_86_305# VPB phighvt w=840000u l=150000u
-+  ad=5.198e+11p pd=4.65e+06u as=9.696e+11p ps=5.88e+06u
-M1003 a_42_411# a_474_313# a_402_411# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1004 a_86_305# A VGND VNB nshort w=640000u l=150000u
-+  ad=6.848e+11p pd=4.7e+06u as=1.2925e+12p ps=8.65e+06u
-M1005 VGND B a_474_313# VNB nshort w=840000u l=150000u
-+  ad=0p pd=0u as=2.394e+11p ps=2.25e+06u
-M1006 VPWR B a_474_313# VPB phighvt w=1.26e+06u l=150000u
-+  ad=0p pd=0u as=3.591e+11p ps=3.09e+06u
-M1007 VGND a_86_305# a_42_411# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=5.102e+11p ps=4.23e+06u
-M1008 VPWR C a_1263_295# VPB phighvt w=640000u l=150000u
-+  ad=0p pd=0u as=1.824e+11p ps=1.85e+06u
-M1009 X a_1363_127# VPWR VPB phighvt w=1.26e+06u l=150000u
-+  ad=3.591e+11p pd=3.09e+06u as=0p ps=0u
-M1010 a_402_411# B a_42_411# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1011 a_402_411# C a_1363_127# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=2.352e+11p ps=2.24e+06u
-M1012 X a_1363_127# VGND VNB nshort w=840000u l=150000u
-+  ad=2.394e+11p pd=2.25e+06u as=0p ps=0u
-M1013 a_425_117# B a_42_411# VPB phighvt w=640000u l=150000u
-+  ad=9.7655e+11p pd=5.74e+06u as=0p ps=0u
-M1014 a_425_117# C a_1363_127# VNB nshort w=640000u l=150000u
-+  ad=4.11e+11p pd=3.92e+06u as=0p ps=0u
-M1015 VGND C a_1263_295# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1016 a_86_305# A VPWR VPB phighvt w=1e+06u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1017 a_1363_127# a_1263_295# a_425_117# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1018 a_425_117# B a_86_305# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_86_305# a_474_313# a_425_117# VPB phighvt w=840000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1020 a_42_411# a_474_313# a_425_117# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 a_86_305# a_474_313# a_402_411# VNB nshort w=640000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
+X0 a_1263_295# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_425_117# a_474_313# a_86_305# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X2 a_86_305# B a_402_411# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X3 a_474_313# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X4 a_1263_295# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X5 a_402_411# a_1263_295# a_1363_127# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X6 VPWR A a_86_305# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X7 VGND a_1363_127# X VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X8 a_42_411# a_86_305# VGND VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X9 a_86_305# B a_425_117# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X10 a_42_411# a_86_305# VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=150000u
+X11 a_402_411# a_474_313# a_42_411# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X12 a_1363_127# C a_402_411# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X13 a_425_117# a_1263_295# a_1363_127# VPB sky130_fd_pr__pfet_01v8_hvt w=840000u l=150000u
+X14 VGND A a_86_305# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X15 a_402_411# a_474_313# a_86_305# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X16 a_42_411# B a_425_117# VPB sky130_fd_pr__pfet_01v8_hvt w=640000u l=150000u
+X17 a_425_117# a_474_313# a_42_411# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X18 VPWR a_1363_127# X VPB sky130_fd_pr__pfet_01v8_hvt w=1.26e+06u l=150000u
+X19 a_474_313# B VGND VNB sky130_fd_pr__nfet_01v8 w=840000u l=150000u
+X20 a_42_411# B a_402_411# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
+X21 a_1363_127# C a_425_117# VNB sky130_fd_pr__nfet_01v8 w=640000u l=150000u
 .ends
diff --git a/cells/xor3/sky130_fd_sc_lp__xor3_lp.cdl b/cells/xor3/sky130_fd_sc_lp__xor3_lp.cdl
index 10a9493..a2ca68c 100644
--- a/cells/xor3/sky130_fd_sc_lp__xor3_lp.cdl
+++ b/cells/xor3/sky130_fd_sc_lp__xor3_lp.cdl
@@ -16,58 +16,58 @@
 
 .SUBCKT sky130_fd_sc_lp__xor3_lp 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 net137 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
-MI650 mid1 Cb 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
-MI1 mid2 C 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
-MI33 Cb C 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
-MI45 Ab A 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
-MI47 Abb Ab 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
-MI19 mid1 Bb 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
-MI16 Bb B 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
-MI23 mid1 B 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
-MI26 mid2 Bb 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
-MI27 mid2 B 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
-MMIN3 X net137 VNB nshort m=1 w=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 net86 net137 VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265
+MMIP3 X net137 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
-MI34 Cb C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI650 mid1 Cb 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
+MI1 mid2 C 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
-MI649 mid1 C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI33 Cb C 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
-MI2 mid2 Cb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI45 Ab A 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
-MI44 Ab A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI47 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
-MI46 Abb Ab VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI19 mid1 Bb 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
-MI17 Bb B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI16 Bb B 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
-MI24 Ab B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI23 mid1 B 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
-MI25 Abb Bb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI26 mid2 Bb 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
-MI28 Abb B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI27 mid2 B 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
-MI29 Ab Bb VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MMIN3 X net137 VNB nfet_01v8 m=1 w=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 net86 net137 VNB nfet_01v8 m=1 w=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 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
-MI38 net145 C VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI649 mid1 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
-MI37 net102 Ab VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI2 mid2 Cb VNB nfet_01v8 m=1 w=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 net98 A VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI44 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
-MI35 net94 B VNB nshort m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
+MI46 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
+MI17 Bb 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
+MI24 Ab 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
+MI25 Abb Bb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI28 Abb B VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI29 Ab Bb VNB nfet_01v8 m=1 w=0.42 l=0.15 mult=1 sa=0.265 sb=0.265
++ sd=0.28 topography=normal area=0.063 perim=1.14
+MI38 net145 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
+MI37 net102 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
+MI36 net98 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
+MI35 net94 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
 .ENDS sky130_fd_sc_lp__xor3_lp
diff --git a/cells/xor3/sky130_fd_sc_lp__xor3_lp.netlist.tsv b/cells/xor3/sky130_fd_sc_lp__xor3_lp.netlist.tsv
index 3d5a1e1..19b6356 100644
--- a/cells/xor3/sky130_fd_sc_lp__xor3_lp.netlist.tsv
+++ b/cells/xor3/sky130_fd_sc_lp__xor3_lp.netlist.tsv
@@ -1,29 +1,29 @@
 sky130_fd_sc_lp__xor3_lp	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	net137	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI650	MOSFET	mid1	Cb	net137	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI1	MOSFET	mid2	C	net137	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI33	MOSFET	Cb	C	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI45	MOSFET	Ab	A	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI47	MOSFET	Abb	Ab	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI19	MOSFET	mid1	Bb	Ab	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI16	MOSFET	Bb	B	VPWR	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI23	MOSFET	mid1	B	Abb	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI26	MOSFET	mid2	Bb	Abb	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MI27	MOSFET	mid2	B	Ab	VPB	phighvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
-MMIN3	MOSFET	X	net137	net86	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI39	MOSFET	net86	net137	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI34	MOSFET	Cb	C	net145	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI649	MOSFET	mid1	C	net137	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI2	MOSFET	mid2	Cb	net137	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI44	MOSFET	Ab	A	net98	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI46	MOSFET	Abb	Ab	net102	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI17	MOSFET	Bb	B	net94	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI24	MOSFET	Ab	B	mid1	VNB	nshort	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI29	MOSFET	Ab	Bb	mid2	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI38	MOSFET	net145	C	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI37	MOSFET	net102	Ab	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI36	MOSFET	net98	A	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
-MI35	MOSFET	net94	B	VGND	VNB	nshort	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIP3	MOSFET	X	net137	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI650	MOSFET	mid1	Cb	net137	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI1	MOSFET	mid2	C	net137	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI33	MOSFET	Cb	C	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI45	MOSFET	Ab	A	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI47	MOSFET	Abb	Ab	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI19	MOSFET	mid1	Bb	Ab	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI16	MOSFET	Bb	B	VPWR	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI23	MOSFET	mid1	B	Abb	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI26	MOSFET	mid2	Bb	Abb	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MI27	MOSFET	mid2	B	Ab	VPB	pfet_01v8_hvt	1	1	0.25	1	0.265	0.265	0.28	normal	0.063	1.14
+MMIN3	MOSFET	X	net137	net86	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI39	MOSFET	net86	net137	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI34	MOSFET	Cb	C	net145	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI649	MOSFET	mid1	C	net137	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI2	MOSFET	mid2	Cb	net137	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI44	MOSFET	Ab	A	net98	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI46	MOSFET	Abb	Ab	net102	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI17	MOSFET	Bb	B	net94	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI24	MOSFET	Ab	B	mid1	VNB	nfet_01v8	1	0.42	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.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI29	MOSFET	Ab	Bb	mid2	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI38	MOSFET	net145	C	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI37	MOSFET	net102	Ab	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI36	MOSFET	net98	A	VGND	VNB	nfet_01v8	1	0.42	0.15	1	0.265	0.265	0.28	normal	0.063	1.14
+MI35	MOSFET	net94	B	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/xor3/sky130_fd_sc_lp__xor3_lp.spice b/cells/xor3/sky130_fd_sc_lp__xor3_lp.spice
index 8614d67..a86a8e7 100644
--- a/cells/xor3/sky130_fd_sc_lp__xor3_lp.spice
+++ b/cells/xor3/sky130_fd_sc_lp__xor3_lp.spice
@@ -16,58 +16,31 @@
 
 
 .subckt sky130_fd_sc_lp__xor3_lp A B C VGND VNB VPB VPWR X
-M1000 a_430_113# a_57_113# VGND VNB nshort w=420000u l=150000u
-+  ad=1.008e+11p pd=1.32e+06u as=6.825e+11p ps=5.77e+06u
-M1001 VGND C a_1860_141# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1002 a_144_113# A a_57_113# VNB nshort w=420000u l=150000u
-+  ad=8.82e+10p pd=1.26e+06u as=3.22525e+11p ps=3.56e+06u
-M1003 a_388_419# a_57_113# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=5.65e+11p pd=5.13e+06u as=1.785e+12p ps=9.57e+06u
-M1004 X a_1459_406# a_2046_141# VNB nshort w=420000u l=150000u
-+  ad=1.197e+11p pd=1.41e+06u as=1.008e+11p ps=1.32e+06u
-M1005 a_1459_406# C a_494_419# VNB nshort w=420000u l=150000u
-+  ad=1.302e+11p pd=1.46e+06u as=3.954e+11p ps=3.6e+06u
-M1006 a_57_113# B a_494_419# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1007 a_388_419# a_580_21# a_855_66# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=5.75e+11p ps=5.15e+06u
-M1008 a_1860_141# C a_1393_300# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.659e+11p ps=1.63e+06u
-M1009 a_494_419# a_580_21# a_388_419# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=2.709e+11p ps=2.97e+06u
-M1010 VGND B a_1245_89# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=8.82e+10p ps=1.26e+06u
-M1011 a_2046_141# a_1459_406# VGND VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1012 a_855_66# C a_1459_406# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.8e+11p ps=2.56e+06u
-M1013 a_388_419# a_57_113# a_430_113# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1014 VPWR B a_580_21# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=3.75e+11p ps=2.75e+06u
-M1015 a_1245_89# B a_580_21# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=1.197e+11p ps=1.41e+06u
-M1016 a_388_419# B a_855_66# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=4.1495e+11p ps=3.82e+06u
-M1017 a_494_419# B a_388_419# VPB phighvt w=1e+06u l=250000u
-+  ad=1.1e+12p pd=6.2e+06u as=0p ps=0u
-M1018 a_855_66# a_580_21# a_57_113# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1019 a_57_113# a_580_21# a_494_419# VPB phighvt w=1e+06u l=250000u
-+  ad=9.05e+11p pd=5.81e+06u as=0p ps=0u
-M1020 a_855_66# B a_57_113# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1021 X a_1459_406# VPWR VPB phighvt w=1e+06u l=250000u
-+  ad=2.85e+11p pd=2.57e+06u as=0p ps=0u
-M1022 a_855_66# a_1393_300# a_1459_406# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1023 VPWR A a_57_113# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1024 a_1459_406# a_1393_300# a_494_419# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=0p ps=0u
-M1025 VGND A a_144_113# VNB nshort w=420000u l=150000u
-+  ad=0p pd=0u as=0p ps=0u
-M1026 VPWR C a_1393_300# VPB phighvt w=1e+06u l=250000u
-+  ad=0p pd=0u as=2.85e+11p ps=2.57e+06u
+X0 a_1245_89# B VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X1 a_494_419# a_580_21# a_57_113# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X2 a_580_21# B VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X3 VGND a_1459_406# a_2046_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X4 a_494_419# C a_1459_406# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X5 a_388_419# a_580_21# a_494_419# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X6 a_1860_141# C VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X7 a_144_113# A VGND VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X8 a_855_66# a_580_21# a_388_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X9 a_1459_406# a_1393_300# a_855_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X10 a_1393_300# C a_1860_141# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X11 a_1459_406# C a_855_66# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X12 a_57_113# A VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X13 a_57_113# a_580_21# a_855_66# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X14 VGND a_57_113# a_430_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X15 a_388_419# B a_494_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X16 a_57_113# B a_855_66# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X17 a_494_419# a_1393_300# a_1459_406# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X18 a_855_66# B a_388_419# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X19 a_494_419# B a_57_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X20 a_1393_300# C VPWR VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X21 VPWR a_1459_406# X VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X22 a_430_113# a_57_113# a_388_419# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X23 a_2046_141# a_1459_406# X VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X24 VPWR a_57_113# a_388_419# VPB sky130_fd_pr__pfet_01v8_hvt w=1e+06u l=250000u
+X25 a_57_113# A a_144_113# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
+X26 a_580_21# B a_1245_89# VNB sky130_fd_pr__nfet_01v8 w=420000u l=150000u
 .ends